Repository: hadoop Updated Branches: refs/heads/branch-2.8 a8cfcce54 -> f685973e2
YARN-5037. Fix random failure of TestRMRestart#testQueueMetricsOnRMRestart (sandflee via Varun Saxena). Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f685973e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f685973e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f685973e Branch: refs/heads/branch-2.8 Commit: f685973e21f499ac69988af0d3eeb284c498307b Parents: a8cfcce Author: Varun Saxena <[email protected]> Authored: Mon Jul 11 09:39:06 2016 +0530 Committer: Varun Saxena <[email protected]> Committed: Mon Jul 11 09:39:06 2016 +0530 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/MockRM.java | 42 ++++++++++++++++++++ .../server/resourcemanager/TestRMRestart.java | 20 ++++++---- 2 files changed, 54 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f685973e/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 70aa970..ddc75a2 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 @@ -88,6 +88,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEventType; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeStartedEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; import org.apache.hadoop.yarn.server.resourcemanager.security.ClientToAMTokenSecretManagerInRM; @@ -106,6 +107,7 @@ public class MockRM extends ResourceManager { static final Logger LOG = Logger.getLogger(MockRM.class); static final String ENABLE_WEBAPP = "mockrm.webapp.enabled"; private static final int SECOND = 1000; + private static final int TIMEOUT_MS_FOR_APP_REMOVED = 40 * SECOND; private static final int TIMEOUT_MS_FOR_CONTAINER_AND_NODE = 10 * SECOND; private static final int WAIT_MS_PER_LOOP = 10; @@ -943,4 +945,44 @@ public class MockRM extends ResourceManager { SignalContainerRequest.newInstance(containerId, command); client.signalToContainer(req); } + + + /** + * Wait until an app removed from scheduler. + * The timeout is 40 seconds. + * @param appId the id of an app + * @throws InterruptedException + * if interrupted while waiting for app removed + */ + 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) { + break; + } + LOG.info("wait for app removed, " + appId); + Thread.sleep(WAIT_MS_PER_LOOP); + timeWaiting += WAIT_MS_PER_LOOP; + } + Assert.assertTrue("app is not removed from scheduler (timeout).", + !apps.containsKey(appId)); + LOG.info("app is removed from scheduler, " + appId); + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f685973e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.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/TestRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java index 6f064a5..029520d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java @@ -1843,6 +1843,10 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase { // finish the AMs finishApplicationMaster(loadedApp1, rm2, nm1, am1); + // now AppAttempt and App becomes FINISHED, + // we should also grant APP_ATTEMPT_REMOVE/APP_REMOVE event + // had processed by scheduler + rm2.waitForAppRemovedFromScheduler(loadedApp1.getApplicationId()); assertQueueMetrics(qm2, 1, 0, 0, 1); } @@ -1864,14 +1868,14 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase { private void assertQueueMetrics(QueueMetrics qm, int appsSubmitted, int appsPending, int appsRunning, int appsCompleted) { - Assert.assertEquals(qm.getAppsSubmitted(), - appsSubmitted + appsSubmittedCarryOn); - Assert.assertEquals(qm.getAppsPending(), - appsPending + appsPendingCarryOn); - Assert.assertEquals(qm.getAppsRunning(), - appsRunning + appsRunningCarryOn); - Assert.assertEquals(qm.getAppsCompleted(), - appsCompleted + appsCompletedCarryOn); + Assert.assertEquals(appsSubmitted + appsSubmittedCarryOn, + qm.getAppsSubmitted()); + Assert.assertEquals(appsPending + appsPendingCarryOn, + qm.getAppsPending()); + Assert.assertEquals(appsRunning + appsRunningCarryOn, + qm.getAppsRunning()); + Assert.assertEquals(appsCompleted + appsCompletedCarryOn, + qm.getAppsCompleted()); } @Test (timeout = 60000) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
