YARN-7186. Fix finicky TestContainerManager tests. Contributed by Arun Suresh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/647b7527 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/647b7527 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/647b7527 Branch: refs/heads/YARN-6592 Commit: 647b7527a9cdf4717e7dcbbb660e5812b67a17f1 Parents: 12d9d7b Author: Junping Du <junping...@apache.org> Authored: Tue Sep 19 18:31:15 2017 -0700 Committer: Junping Du <junping...@apache.org> Committed: Tue Sep 19 18:31:15 2017 -0700 ---------------------------------------------------------------------- .../containermanager/TestContainerManager.java | 128 ------------------- .../TestContainerSchedulerQueuing.java | 70 ++++++++++ 2 files changed, 70 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/647b7527/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 6eea77b..38df208 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 @@ -70,7 +70,6 @@ import org.apache.hadoop.yarn.api.records.ContainerRetryContext; import org.apache.hadoop.yarn.api.records.ContainerRetryPolicy; import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.api.records.ContainerStatus; -import org.apache.hadoop.yarn.api.records.ExecutionType; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; @@ -105,7 +104,6 @@ import org.apache.hadoop.yarn.server.nodemanager.executor.ContainerSignalContext import org.apache.hadoop.yarn.server.nodemanager.executor.ContainerStartContext; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; @@ -142,14 +140,6 @@ public class TestContainerManager extends BaseContainerManagerTest { exec.setConf(conf); return spy(exec); } - - @Override - @Before - public void setup() throws IOException { - conf.setInt( - YarnConfiguration.NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH, 0); - super.setup(); - } @Override protected ContainerManagerImpl @@ -1945,122 +1935,4 @@ public class TestContainerManager extends BaseContainerManagerTest { Assert.assertTrue(response.getFailedRequests().get(cId).getMessage() .contains("Null resource visibility for local resource")); } - - @Test - public void testContainerUpdateExecTypeOpportunisticToGuaranteed() - throws IOException, YarnException, InterruptedException { - delayContainers = true; - containerManager.start(); - // Construct the Container-id - ContainerId cId = createContainerId(0); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - - StartContainerRequest scRequest = - StartContainerRequest.newInstance( - containerLaunchContext, - createContainerToken(cId, DUMMY_RM_IDENTIFIER, - context.getNodeId(), user, BuilderUtils.newResource(512, 1), - context.getContainerTokenSecretManager(), null, - ExecutionType.OPPORTUNISTIC)); - List<StartContainerRequest> list = new ArrayList<>(); - list.add(scRequest); - StartContainersRequest allRequests = - StartContainersRequest.newInstance(list); - containerManager.startContainers(allRequests); - // Make sure the container reaches RUNNING state - BaseContainerManagerTest.waitForNMContainerState(containerManager, cId, - org.apache.hadoop.yarn.server.nodemanager. - containermanager.container.ContainerState.RUNNING); - // Construct container resource increase request, - List<Token> updateTokens = new ArrayList<>(); - Token containerToken = - createContainerToken(cId, 1, DUMMY_RM_IDENTIFIER, context.getNodeId(), - user, BuilderUtils.newResource(512, 1), - context.getContainerTokenSecretManager(), null, - ExecutionType.GUARANTEED); - updateTokens.add(containerToken); - ContainerUpdateRequest updateRequest = - ContainerUpdateRequest.newInstance(updateTokens); - ContainerUpdateResponse updateResponse = - containerManager.updateContainer(updateRequest); - - Assert.assertEquals( - 1, updateResponse.getSuccessfullyUpdatedContainers().size()); - Assert.assertTrue(updateResponse.getFailedRequests().isEmpty()); - - //Make sure the container is running - List<ContainerId> statList = new ArrayList<ContainerId>(); - statList.add(cId); - GetContainerStatusesRequest statRequest = - GetContainerStatusesRequest.newInstance(statList); - List<ContainerStatus> containerStatuses = containerManager - .getContainerStatuses(statRequest).getContainerStatuses(); - Assert.assertEquals(1, containerStatuses.size()); - for (ContainerStatus status : containerStatuses) { - Assert.assertEquals( - org.apache.hadoop.yarn.api.records.ContainerState.RUNNING, - status.getState()); - Assert.assertEquals(ExecutionType.GUARANTEED, status.getExecutionType()); - } - } - - @Test - public void testContainerUpdateExecTypeGuaranteedToOpportunistic() - throws IOException, YarnException, InterruptedException { - delayContainers = true; - containerManager.start(); - // Construct the Container-id - ContainerId cId = createContainerId(0); - ContainerLaunchContext containerLaunchContext = - recordFactory.newRecordInstance(ContainerLaunchContext.class); - - StartContainerRequest scRequest = - StartContainerRequest.newInstance( - containerLaunchContext, - createContainerToken(cId, DUMMY_RM_IDENTIFIER, - context.getNodeId(), user, BuilderUtils.newResource(512, 1), - context.getContainerTokenSecretManager(), null)); - List<StartContainerRequest> list = new ArrayList<>(); - list.add(scRequest); - StartContainersRequest allRequests = - StartContainersRequest.newInstance(list); - containerManager.startContainers(allRequests); - // Make sure the container reaches RUNNING state - BaseContainerManagerTest.waitForNMContainerState(containerManager, cId, - org.apache.hadoop.yarn.server.nodemanager. - containermanager.container.ContainerState.RUNNING); - // Construct container resource increase request, - List<Token> updateTokens = new ArrayList<>(); - Token containerToken = - createContainerToken(cId, 1, DUMMY_RM_IDENTIFIER, context.getNodeId(), - user, BuilderUtils.newResource(512, 1), - context.getContainerTokenSecretManager(), null, - ExecutionType.OPPORTUNISTIC); - updateTokens.add(containerToken); - ContainerUpdateRequest updateRequest = - ContainerUpdateRequest.newInstance(updateTokens); - ContainerUpdateResponse updateResponse = - containerManager.updateContainer(updateRequest); - - Assert.assertEquals( - 1, updateResponse.getSuccessfullyUpdatedContainers().size()); - Assert.assertTrue(updateResponse.getFailedRequests().isEmpty()); - - //Make sure the container is running - List<ContainerId> statList = new ArrayList<ContainerId>(); - statList.add(cId); - GetContainerStatusesRequest statRequest = - GetContainerStatusesRequest.newInstance(statList); - List<ContainerStatus> containerStatuses = containerManager - .getContainerStatuses(statRequest).getContainerStatuses(); - Assert.assertEquals(1, containerStatuses.size()); - for (ContainerStatus status : containerStatuses) { - Assert.assertEquals( - org.apache.hadoop.yarn.api.records.ContainerState.RUNNING, - status.getState()); - Assert - .assertEquals(ExecutionType.OPPORTUNISTIC, status.getExecutionType()); - } - } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/647b7527/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 f3fc724..7c74049 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 @@ -1147,7 +1147,77 @@ public class TestContainerSchedulerQueuing extends BaseContainerManagerTest { waitForContainerState(containerManager, createContainerId(1), org.apache.hadoop.yarn.api.records.ContainerState.RUNNING); + containerStatuses = containerManager + .getContainerStatuses(statRequest).getContainerStatuses(); + Assert.assertEquals(1, containerStatuses.size()); + for (ContainerStatus status : containerStatuses) { + if (org.apache.hadoop.yarn.api.records.ContainerState.RUNNING == + status.getState()) { + Assert.assertEquals( + ExecutionType.GUARANTEED, status.getExecutionType()); + } + } + // Ensure no containers are queued. Assert.assertEquals(0, containerScheduler.getNumQueuedContainers()); } + + @Test + public void testContainerUpdateExecTypeGuaranteedToOpportunistic() + throws IOException, YarnException, InterruptedException { + delayContainers = true; + containerManager.start(); + // Construct the Container-id + ContainerId cId = createContainerId(0); + ContainerLaunchContext containerLaunchContext = + recordFactory.newRecordInstance(ContainerLaunchContext.class); + + StartContainerRequest scRequest = + StartContainerRequest.newInstance( + containerLaunchContext, + createContainerToken(cId, DUMMY_RM_IDENTIFIER, + context.getNodeId(), user, BuilderUtils.newResource(512, 1), + context.getContainerTokenSecretManager(), null)); + List<StartContainerRequest> list = new ArrayList<>(); + list.add(scRequest); + StartContainersRequest allRequests = + StartContainersRequest.newInstance(list); + containerManager.startContainers(allRequests); + // Make sure the container reaches RUNNING state + BaseContainerManagerTest.waitForNMContainerState(containerManager, cId, + org.apache.hadoop.yarn.server.nodemanager. + containermanager.container.ContainerState.RUNNING); + // Construct container resource increase request, + List<Token> updateTokens = new ArrayList<>(); + Token containerToken = + createContainerToken(cId, 1, DUMMY_RM_IDENTIFIER, context.getNodeId(), + user, BuilderUtils.newResource(512, 1), + context.getContainerTokenSecretManager(), null, + ExecutionType.OPPORTUNISTIC); + updateTokens.add(containerToken); + ContainerUpdateRequest updateRequest = + ContainerUpdateRequest.newInstance(updateTokens); + ContainerUpdateResponse updateResponse = + containerManager.updateContainer(updateRequest); + + Assert.assertEquals( + 1, updateResponse.getSuccessfullyUpdatedContainers().size()); + Assert.assertTrue(updateResponse.getFailedRequests().isEmpty()); + + //Make sure the container is running + List<ContainerId> statList = new ArrayList<ContainerId>(); + statList.add(cId); + GetContainerStatusesRequest statRequest = + GetContainerStatusesRequest.newInstance(statList); + List<ContainerStatus> containerStatuses = containerManager + .getContainerStatuses(statRequest).getContainerStatuses(); + Assert.assertEquals(1, containerStatuses.size()); + for (ContainerStatus status : containerStatuses) { + Assert.assertEquals( + org.apache.hadoop.yarn.api.records.ContainerState.RUNNING, + status.getState()); + Assert + .assertEquals(ExecutionType.OPPORTUNISTIC, status.getExecutionType()); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
