Repository: hadoop Updated Branches: refs/heads/branch-2 f278494a5 -> 204674f41
YARN-8039. Clean up log dir configuration in TestLinuxContainerExecutorWithMocks.testStartLocalizer. Contributed by Miklos Szegedi. (cherry picked from commit 49c747ab187d0650143205ba57ca19607ec4c6bd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/204674f4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/204674f4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/204674f4 Branch: refs/heads/branch-2 Commit: 204674f4146b2869618c1c3ad58a140febc4df28 Parents: f278494 Author: Yufei Gu <[email protected]> Authored: Fri Mar 16 16:25:33 2018 -0700 Committer: Yufei Gu <[email protected]> Committed: Fri Mar 16 16:34:14 2018 -0700 ---------------------------------------------------------------------- .../server/nodemanager/TestLinuxContainerExecutorWithMocks.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/204674f4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java index 1ae740f..79b88cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java @@ -150,6 +150,7 @@ public class TestLinuxContainerExecutorWithMocks { LinuxContainerRuntime linuxContainerRuntime; LinuxContainerRuntime mockLinuxContainerRuntime; + conf.set(YarnConfiguration.NM_LOG_DIRS, "src/test/resources"); setupMockExecutor(MOCK_EXECUTOR, conf); linuxContainerRuntime = new DefaultLinuxContainerRuntime( PrivilegedOperationExecutor.getInstance(conf)); @@ -279,7 +280,8 @@ public class TestLinuxContainerExecutorWithMocks { Assert.assertEquals(result.get(13), "-Dlog4j.configuration=container-log4j.properties" ); Assert.assertEquals(result.get(14), - "-Dyarn.app.container.log.dir=${yarn.log.dir}/userlogs/application_0/12345"); + String.format("-Dyarn.app.container.log.dir=%s/application_0/12345", + mockExec.getConf().get(YarnConfiguration.NM_LOG_DIRS))); Assert.assertEquals(result.get(15), "-Dyarn.app.container.log.filesize=0"); Assert.assertEquals(result.get(16), "-Dhadoop.root.logger=INFO,CLA"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
