Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6359. TestRM#testApplicationKillAtAcceptedState fails rarely due to race condition. Contributed by Robert Kanter 

(cherry picked from commit bea8f8190f)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
This commit is contained in:
Jason Lowe 2017-03-28 09:33:26 -05:00
parent ca3ede5fda
commit b1f0bde5dc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
View File

@ -18,6 +18,8 @@
package org.apache.hadoop.yarn.server.resourcemanager;
import com.google.common.base.Supplier;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Before;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.doNothing;
@ -593,9 +595,9 @@ public class TestRM extends ParameterizedSchedulerTestBase {
};
// test metrics
QueueMetrics metrics = rm.getResourceScheduler().getRootQueueMetrics();
int appsKilled = metrics.getAppsKilled();
int appsSubmitted = metrics.getAppsSubmitted();
final QueueMetrics metrics = rm.getResourceScheduler().getRootQueueMetrics();
final int appsKilled = metrics.getAppsKilled();
final int appsSubmitted = metrics.getAppsSubmitted();
rm.start();
@ -633,7 +635,13 @@ public class TestRM extends ParameterizedSchedulerTestBase {
rm.waitForState(application.getApplicationId(), RMAppState.KILLED);
// test metrics
metrics = rm.getResourceScheduler().getRootQueueMetrics();
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@Override
public Boolean get() {
return appsKilled + 1 == metrics.getAppsKilled()
&& appsSubmitted + 1 == metrics.getAppsSubmitted();
}
}, 100, 10000);
Assert.assertEquals(appsKilled + 1, metrics.getAppsKilled());
Assert.assertEquals(appsSubmitted + 1, metrics.getAppsSubmitted());
}