Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08E8610DBE for ; Mon, 5 Jan 2015 21:15:56 +0000 (UTC) Received: (qmail 6473 invoked by uid 500); 5 Jan 2015 21:15:57 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 6436 invoked by uid 500); 5 Jan 2015 21:15:57 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 6427 invoked by uid 99); 5 Jan 2015 21:15:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2015 21:15:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AB302A407C9; Mon, 5 Jan 2015 21:15:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@tez.apache.org Date: Mon, 05 Jan 2015 21:15:56 -0000 Message-Id: <2aa084d08b914cad88fa02ac7d1de96a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] tez git commit: TEZ-1837. Restrict usage of Environment variables to main methods. (sseth) Repository: tez Updated Branches: refs/heads/master dcd73b38a -> 976074473 http://git-wip-us.apache.org/repos/asf/tez/blob/97607447/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java index cd02655..0d1a9c0 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java @@ -24,12 +24,11 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.io.Text; -import org.apache.hadoop.yarn.api.ApplicationConstants; -import org.apache.tez.common.EnvironmentUpdateUtils; import org.apache.tez.common.TezUtils; import org.apache.tez.common.TezRuntimeFrameworkConfigs; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.dag.api.UserPayload; +import org.apache.tez.runtime.api.ExecutionContext; import org.apache.tez.runtime.api.Event; import org.apache.tez.runtime.api.MemoryUpdateCallback; import org.apache.tez.runtime.api.OutputContext; @@ -122,7 +121,6 @@ public class TestOnFileSortedOutput { conf.setBoolean(TezRuntimeConfiguration.TEZ_RUNTIME_EMPTY_PARTITION_INFO_VIA_EVENTS_ENABLED, sendEmptyPartitionViaEvent); - EnvironmentUpdateUtils.put(ApplicationConstants.Environment.NM_HOST.toString(), HOST); fs.mkdirs(workingDir); this.partitions = Math.max(1, rnd.nextInt(10)); } @@ -287,6 +285,9 @@ public class TestOnFileSortedOutput { return null; } }).when(context).requestInitialMemory(anyLong(), any(MemoryUpdateCallback.class)); + ExecutionContext ExecutionContext = mock(ExecutionContext.class); + doReturn(HOST).when(ExecutionContext).getHostName(); + doReturn(ExecutionContext).when(context).getExecutionContext(); return context; } http://git-wip-us.apache.org/repos/asf/tez/blob/97607447/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java index b5d1975..91d558f 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java @@ -51,6 +51,7 @@ import org.apache.tez.runtime.RuntimeTask; import org.apache.tez.runtime.api.Event; import org.apache.tez.runtime.api.OutputContext; import org.apache.tez.runtime.api.events.DataMovementEvent; +import org.apache.tez.runtime.api.impl.ExecutionContextImpl; import org.apache.tez.runtime.api.impl.TezOutputContextImpl; import org.apache.tez.runtime.api.impl.TezUmbilical; import org.apache.tez.runtime.common.resources.MemoryDistributor; @@ -124,7 +125,8 @@ public class TestOnFileUnorderedKVOutput { OutputContext outputContext = new TezOutputContextImpl(conf, new String[] {workDir.toString()}, appAttemptNumber, tezUmbilical, dagName, taskVertexName, destinationVertexName, -1, taskAttemptID, counters, 0, userPayload, runtimeTask, - null, auxEnv, new MemoryDistributor(1, 1, conf) , outputDescriptor, null); + null, auxEnv, new MemoryDistributor(1, 1, conf) , outputDescriptor, null, + new ExecutionContextImpl("localhost")); UnorderedKVOutput kvOutput = new OnFileUnorderedKVOutputForTest(outputContext, 1);