Repository: hadoop Updated Branches: refs/heads/trunk a9d68d2e8 -> cc2c993a8
YARN-4907. Make all MockRM#waitForState consistent. (Contributed by Yufei Gu via Daniel Templeton) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc2c993a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc2c993a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc2c993a Branch: refs/heads/trunk Commit: cc2c993a8af6265b9881550501fd16f783519e03 Parents: a9d68d2 Author: Daniel Templeton <templ...@apache.org> Authored: Mon Oct 31 13:18:33 2016 -0700 Committer: Daniel Templeton <templ...@apache.org> Committed: Mon Oct 31 13:20:56 2016 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/MockRM.java | 44 +++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc2c993a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index 25a8288..58bb721 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -272,9 +272,10 @@ public class MockRM extends ResourceManager { public void waitForContainerToComplete(RMAppAttempt attempt, NMContainerStatus completedContainer) throws InterruptedException { - while (true) { + int timeWaiting = 0; + while (timeWaiting < TIMEOUT_MS_FOR_CONTAINER_AND_NODE) { List<ContainerStatus> containers = attempt.getJustFinishedContainers(); - System.out.println("Received completed containers " + containers); + LOG.info("Received completed containers " + containers); for (ContainerStatus container : containers) { if (container.getContainerId().equals( completedContainer.getContainerId())) { @@ -282,6 +283,7 @@ public class MockRM extends ResourceManager { } } Thread.sleep(WAIT_MS_PER_LOOP); + timeWaiting += WAIT_MS_PER_LOOP; } } @@ -289,11 +291,16 @@ public class MockRM extends ResourceManager { MockNM nm) throws Exception { RMApp app = getRMContext().getRMApps().get(appId); Assert.assertNotNull(app); + int timeWaiting = 0; while (app.getAppAttempts().size() != attemptSize) { - System.out.println("Application " + appId + if (timeWaiting >= TIMEOUT_MS_FOR_ATTEMPT) { + break; + } + LOG.info("Application " + appId + " is waiting for AM to restart. Current has " + app.getAppAttempts().size() + " attempts."); Thread.sleep(WAIT_MS_PER_LOOP); + timeWaiting += WAIT_MS_PER_LOOP; } return launchAndRegisterAM(app, this, nm); } @@ -375,7 +382,7 @@ public class MockRM extends ResourceManager { nm.nodeHeartbeat(true); } container = getResourceScheduler().getRMContainer(containerId); - System.out.println("Waiting for container " + containerId + " to be " + LOG.info("Waiting for container " + containerId + " to be " + containerState + ", container is null right now."); Thread.sleep(WAIT_MS_PER_LOOP); timeWaiting += WAIT_MS_PER_LOOP; @@ -386,7 +393,7 @@ public class MockRM extends ResourceManager { return false; } - System.out.println("Container : " + containerId + " State is : " + LOG.info("Container : " + containerId + " State is : " + container.getState() + " Waiting for state : " + containerState); for (MockNM nm : nms) { nm.nodeHeartbeat(true); @@ -395,7 +402,7 @@ public class MockRM extends ResourceManager { timeWaiting += WAIT_MS_PER_LOOP; } - System.out.println("Container State is : " + container.getState()); + LOG.info("Container State is : " + container.getState()); return true; } @@ -724,13 +731,13 @@ public class MockRM extends ResourceManager { break; } - System.out.println("Node State is : " + node.getState() + LOG.info("Node State is : " + node.getState() + " Waiting for state : " + finalState); Thread.sleep(WAIT_MS_PER_LOOP); timeWaiting += WAIT_MS_PER_LOOP; } - System.out.println("Node " + nodeId + " State is : " + node.getState()); + LOG.info("Node " + nodeId + " State is : " + node.getState()); Assert.assertEquals("Node state is not correct (timedout)", finalState, node.getState()); } @@ -949,7 +956,7 @@ public class MockRM extends ResourceManager { .getApplicationAttempt(attemptId) && tick < 50) { Thread.sleep(100); if (tick % 10 == 0) { - System.out.println("waiting for SchedulerApplicationAttempt=" + LOG.info("waiting for SchedulerApplicationAttempt=" + attemptId + " added."); } tick++; @@ -966,7 +973,7 @@ public class MockRM extends ResourceManager { public static MockAM launchAM(RMApp app, MockRM rm, MockNM nm) throws Exception { RMAppAttempt attempt = waitForAttemptScheduled(app, rm); - System.out.println("Launch AM " + attempt.getAppAttemptId()); + LOG.info("Launch AM " + attempt.getAppAttemptId()); nm.nodeHeartbeat(true); MockAM am = rm.sendAMLaunched(attempt.getAppAttemptId()); rm.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.LAUNCHED); @@ -979,7 +986,7 @@ public class MockRM extends ResourceManager { rm.waitForState(app.getApplicationId(), RMAppState.ACCEPTED); RMAppAttempt attempt = app.getCurrentAppAttempt(); waitForSchedulerAppAttemptAdded(attempt.getAppAttemptId(), rm); - System.out.println("Launch AM " + attempt.getAppAttemptId()); + LOG.info("Launch AM " + attempt.getAppAttemptId()); nm.nodeHeartbeat(true); MockAM am = new MockAM(rm.getRMContext(), rm.masterService, attempt.getAppAttemptId()); @@ -1039,7 +1046,6 @@ public class MockRM extends ResourceManager { client.signalToContainer(req); } - /** * Wait until an app removed from scheduler. * The timeout is 40 seconds. @@ -1049,25 +1055,13 @@ public class MockRM extends ResourceManager { */ public void waitForAppRemovedFromScheduler(ApplicationId appId) throws InterruptedException { - waitForAppRemovedFromScheduler(appId, TIMEOUT_MS_FOR_APP_REMOVED); - } - - /** - * Wait until an app is removed from scheduler. - * @param appId the id of an app - * @param timeoutMsecs the length of timeout in milliseconds - * @throws InterruptedException - * if interrupted while waiting for app removed - */ - public void waitForAppRemovedFromScheduler(ApplicationId appId, - long timeoutMsecs) throws InterruptedException { int timeWaiting = 0; Map<ApplicationId, SchedulerApplication> apps = ((AbstractYarnScheduler) getResourceScheduler()) .getSchedulerApplications(); while (apps.containsKey(appId)) { - if (timeWaiting >= timeoutMsecs) { + if (timeWaiting >= TIMEOUT_MS_FOR_APP_REMOVED) { break; } LOG.info("wait for app removed, " + appId); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
