YARN-8244. TestContainerSchedulerQueuing.testStartMultipleContainers failed. Contributed by Jim Brennan
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc912994 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc912994 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc912994 Branch: refs/heads/HDDS-4 Commit: dc912994a1bcb511dfda32a0649cef0c9bdc47d3 Parents: ba12e88 Author: Jason Lowe <jl...@apache.org> Authored: Fri May 11 14:07:32 2018 -0500 Committer: Jason Lowe <jl...@apache.org> Committed: Fri May 11 14:07:32 2018 -0500 ---------------------------------------------------------------------- .../containermanager/TestContainerManager.java | 20 ++-- .../TestContainerSchedulerQueuing.java | 100 +++++++------------ 2 files changed, 42 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc912994/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.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/containermanager/TestContainerManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java index 6d198a4..ee5259f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java @@ -1486,8 +1486,6 @@ public class TestContainerManager extends BaseContainerManagerTest { containerManager.start(); List<StartContainerRequest> list = new ArrayList<>(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); for (int i = 0; i < 10; i++) { ContainerId cId = createContainerId(i); long identifier = 0; @@ -1500,8 +1498,9 @@ public class TestContainerManager extends BaseContainerManagerTest { createContainerToken(cId, identifier, context.getNodeId(), user, context.getContainerTokenSecretManager()); StartContainerRequest request = - StartContainerRequest.newInstance(containerLaunchContext, - containerToken); + StartContainerRequest.newInstance( + recordFactory.newRecordInstance(ContainerLaunchContext.class), + containerToken); list.add(request); } StartContainersRequest requestList = @@ -1531,9 +1530,6 @@ public class TestContainerManager extends BaseContainerManagerTest { public void testMultipleContainersStopAndGetStatus() throws Exception { containerManager.start(); List<StartContainerRequest> startRequest = new ArrayList<>(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<ContainerId> containerIds = new ArrayList<>(); for (int i = 0; i < 10; i++) { ContainerId cId; @@ -1547,8 +1543,9 @@ public class TestContainerManager extends BaseContainerManagerTest { createContainerToken(cId, DUMMY_RM_IDENTIFIER, context.getNodeId(), user, context.getContainerTokenSecretManager()); StartContainerRequest request = - StartContainerRequest.newInstance(containerLaunchContext, - containerToken); + StartContainerRequest.newInstance( + recordFactory.newRecordInstance(ContainerLaunchContext.class), + containerToken); startRequest.add(request); containerIds.add(cId); } @@ -1788,15 +1785,14 @@ public class TestContainerManager extends BaseContainerManagerTest { containerManager.start(); // Start 4 containers 0..4 with default resource (1024, 1) List<StartContainerRequest> list = new ArrayList<>(); - ContainerLaunchContext containerLaunchContext = recordFactory - .newRecordInstance(ContainerLaunchContext.class); for (int i = 0; i < 4; i++) { ContainerId cId = createContainerId(i); long identifier = DUMMY_RM_IDENTIFIER; Token containerToken = createContainerToken(cId, identifier, context.getNodeId(), user, context.getContainerTokenSecretManager()); StartContainerRequest request = StartContainerRequest.newInstance( - containerLaunchContext, containerToken); + recordFactory.newRecordInstance(ContainerLaunchContext.class), + containerToken); list.add(request); } StartContainersRequest requestList = StartContainersRequest http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc912994/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerQueuing.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/containermanager/scheduler/TestContainerSchedulerQueuing.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerQueuing.java index 1da7e4a..70066c6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerQueuing.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerQueuing.java @@ -229,19 +229,16 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testStartMultipleContainers() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1024, 1), context.getContainerTokenSecretManager(), null, ExecutionType.GUARANTEED))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1024, 1), @@ -285,19 +282,16 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testQueueMultipleContainers() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(3072, 1), context.getContainerTokenSecretManager(), null, ExecutionType.GUARANTEED))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(3072, 1), @@ -343,26 +337,23 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testStartAndQueueMultipleContainers() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1024, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1024, 1), @@ -415,12 +406,9 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testStartOpportunistcsWhenOppQueueIsFull() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), @@ -432,7 +420,7 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { YarnConfiguration.DEFAULT_NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH); for (int i = 1; i < maxOppQueueLength + 2; i++) { list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(i), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), @@ -500,26 +488,23 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testKillOpportunisticForGuaranteedContainer() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), @@ -589,12 +574,10 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { Listener listener = new Listener(); ((NodeManager.DefaultContainerStateListener)containerManager.getContext(). getContainerStateTransitionListener()).addListener(listener); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), @@ -610,7 +593,7 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), @@ -718,42 +701,42 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(3), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(4), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(5), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(6), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -840,14 +823,14 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -887,26 +870,23 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testKillMultipleOpportunisticContainers() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -919,7 +899,7 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(3), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1500, 1), @@ -967,14 +947,11 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testKillOnlyRequiredOpportunisticContainers() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); // Fill NM with Opportunistic containers for (int i = 0; i < 4; i++) { list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(i), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -990,7 +967,7 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { // Now ask for two Guaranteed containers for (int i = 4; i < 6; i++) { list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(i), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -1036,26 +1013,23 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { public void testStopQueuedContainer() throws Exception { containerManager.start(); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), context.getContainerTokenSecretManager(), null, ExecutionType.GUARANTEED))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(2), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), @@ -1142,19 +1116,16 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { ((NodeManager.DefaultContainerStateListener)containerManager.getContext(). getContainerStateTransitionListener()).addListener(listener); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - List<StartContainerRequest> list = new ArrayList<>(); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(0), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(2048, 1), context.getContainerTokenSecretManager(), null, ExecutionType.OPPORTUNISTIC))); list.add(StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(createContainerId(1), DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(1024, 1), @@ -1265,12 +1236,9 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { containerManager.start(); // Construct the Container-id ContainerId cId = createContainerId(0); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - StartContainerRequest scRequest = StartContainerRequest.newInstance( - containerLaunchContext, + recordFactory.newRecordInstance(ContainerLaunchContext.class), createContainerToken(cId, DUMMY_RM_IDENTIFIER, context.getNodeId(), user, BuilderUtils.newResource(512, 1), context.getContainerTokenSecretManager(), null)); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
