YARN-5444. Fix failing unit tests in TestLinuxContainerExecutorWithMocks. Contributed by Yufei Gu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95694b70 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95694b70 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95694b70 Branch: refs/heads/HADOOP-12756 Commit: 95694b70cd38dfc591dc4f0e9413809cf3c91dbe Parents: 770b5eb Author: Varun Vasudev <vvasu...@apache.org> Authored: Mon Aug 1 16:00:17 2016 +0530 Committer: Varun Vasudev <vvasu...@apache.org> Committed: Mon Aug 1 16:08:38 2016 +0530 ---------------------------------------------------------------------- .../yarn/server/nodemanager/LinuxContainerExecutor.java | 1 + .../nodemanager/TestLinuxContainerExecutorWithMocks.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/95694b70/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java index 04e38fa..8f5ee6b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java @@ -97,6 +97,7 @@ public class LinuxContainerExecutor extends ContainerExecutor { resourcesHandler = getResourcesHandler(conf); + containerSchedPriorityIsSet = false; if (conf.get(YarnConfiguration.NM_CONTAINER_EXECUTOR_SCHED_PRIORITY) != null) { containerSchedPriorityIsSet = true; http://git-wip-us.apache.org/repos/asf/hadoop/blob/95694b70/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 ae5a011..23f58bb 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 @@ -128,7 +128,7 @@ public class TestLinuxContainerExecutorWithMocks { tmpMockExecutor = System.getProperty("test.build.data") + "/tmp-mock-container-executor"; - Configuration conf = new Configuration(); + Configuration conf = new YarnConfiguration(); LinuxContainerRuntime linuxContainerRuntime; setupMockExecutor(MOCK_EXECUTOR, conf); @@ -220,7 +220,10 @@ public class TestLinuxContainerExecutorWithMocks { public void testLaunchCommandWithoutPriority() throws IOException { // make sure the command doesn't contain the nice -n since priority // not specified - List<String> command = new ArrayList<String>(); + List<String> command = new ArrayList<String>(); + Configuration conf = mockExec.getConf(); + conf.unset(YarnConfiguration.NM_CONTAINER_EXECUTOR_SCHED_PRIORITY); + mockExec.setConf(conf); mockExec.addSchedPriorityCommand(command); assertEquals("addSchedPriority should be empty", 0, command.size()); } @@ -243,7 +246,7 @@ public class TestLinuxContainerExecutorWithMocks { .build()); List<String> result=readMockParams(); - Assert.assertEquals(result.size(), 18); + Assert.assertEquals(result.size(), 19); Assert.assertEquals(result.get(0), YarnConfiguration.DEFAULT_NM_NONSECURE_MODE_LOCAL_USER); Assert.assertEquals(result.get(1), "test"); Assert.assertEquals(result.get(2), "0" ); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org