commit dfdce684b135fc6a498375379146d761c91705c1 Author: Vinod Kumar Vavilapalli Date: Sat Dec 28 09:41:55 2013 -0800 YARN-1522 diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java index 5eecae0..75bb225 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java @@ -100,26 +100,32 @@ public void testAppCleanup() throws Exception { //currently only containers are cleaned via this //AM container is cleaned via container launcher resp = nm1.nodeHeartbeat(true); - List contsToClean = resp.getContainersToCleanup(); - List apps = resp.getApplicationsToCleanup(); - int cleanedConts = contsToClean.size(); - int cleanedApps = apps.size(); + List containersToCleanup = resp.getContainersToCleanup(); + List appsToCleanup = resp.getApplicationsToCleanup(); + int numCleanedContainers = containersToCleanup.size(); + int numCleanedApps = appsToCleanup.size(); waitCount = 0; - while ((cleanedConts < 2 || cleanedApps < 1) && waitCount++ < 200) { + while ((numCleanedContainers < 2 || numCleanedApps < 1) + && waitCount++ < 200) { LOG.info("Waiting to get cleanup events.. cleanedConts: " - + cleanedConts + " cleanedApps: " + cleanedApps); + + numCleanedContainers + " cleanedApps: " + numCleanedApps); Thread.sleep(100); resp = nm1.nodeHeartbeat(true); - contsToClean = resp.getContainersToCleanup(); - apps = resp.getApplicationsToCleanup(); - cleanedConts += contsToClean.size(); - cleanedApps += apps.size(); + List deltaContainersToCleanup = + resp.getContainersToCleanup(); + List deltaAppsToCleanup = resp.getApplicationsToCleanup(); + // Add the deltas to the global list + containersToCleanup.addAll(deltaContainersToCleanup); + appsToCleanup.addAll(deltaAppsToCleanup); + // Update counts now + numCleanedContainers = containersToCleanup.size(); + numCleanedApps = appsToCleanup.size(); } - Assert.assertEquals(1, apps.size()); - Assert.assertEquals(app.getApplicationId(), apps.get(0)); - Assert.assertEquals(1, cleanedApps); - Assert.assertEquals(2, cleanedConts); + Assert.assertEquals(1, appsToCleanup.size()); + Assert.assertEquals(app.getApplicationId(), appsToCleanup.get(0)); + Assert.assertEquals(1, numCleanedApps); + Assert.assertEquals(2, numCleanedContainers); rm.stop(); }