YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529533 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2013-10-05 22:12:24 +00:00
parent 0de66e4a77
commit b5df25e3a8
2 changed files with 9 additions and 5 deletions

View File

@ -48,6 +48,8 @@ Release 2.3.0 - UNRELEASED
YARN-1188. The context of QueueMetrics becomes default when using
FairScheduler (Tsuyoshi Ozawa via Sandy Ryza)
YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)
Release 2.2.0 - UNRELEASED

View File

@ -2279,7 +2279,7 @@ public void testConcurrentAccessOnApplications() throws Exception {
fs.applications, FSSchedulerApp.class);
}
@Test
@Test (timeout = 5000)
public void testContinuousScheduling() throws Exception {
// set continuous scheduling enabled
FairScheduler fs = new FairScheduler();
@ -2315,11 +2315,13 @@ public void testContinuousScheduling() throws Exception {
// at least one pass
Thread.sleep(fs.getConf().getContinuousSchedulingSleepMs() + 500);
FSSchedulerApp app = fs.applications.get(appAttemptId);
// Wait until app gets resources.
while (app.getCurrentConsumption().equals(Resources.none())) { }
// check consumption
Resource consumption =
fs.applications.get(appAttemptId).getCurrentConsumption();
Assert.assertEquals(1024, consumption.getMemory());
Assert.assertEquals(1, consumption.getVirtualCores());
Assert.assertEquals(1024, app.getCurrentConsumption().getMemory());
Assert.assertEquals(1, app.getCurrentConsumption().getVirtualCores());
}