YARN-9501. TestCapacitySchedulerOvercommit#testReducePreemptAndCancel fails intermittent. Contributed by Prabhu Joseph.
This commit is contained in:
parent
4a0ba24959
commit
fec9bf4b0b
|
@ -286,6 +286,9 @@ public abstract class TestSchedulerOvercommit {
|
|||
updateNodeResource(rm, nmId, 2 * GB, 2, timeout);
|
||||
waitMemory(scheduler, nm, 4 * GB, -2 * GB, INTERVAL, timeout);
|
||||
|
||||
// wait until MARK_CONTAINER_FOR_PREEMPTION is handled
|
||||
rm.drainEvents();
|
||||
|
||||
// We should receive a notification to preempt the container
|
||||
PreemptionMessage preemptMsg = am.schedule().getPreemptionMessage();
|
||||
assertPreemption(container.getId(), preemptMsg);
|
||||
|
@ -315,13 +318,16 @@ public abstract class TestSchedulerOvercommit {
|
|||
Container container = createContainer(am, 2 * GB);
|
||||
assertMemory(scheduler, nmId, 4 * GB, 0);
|
||||
|
||||
// We give an overcommit time out of 2 seconds
|
||||
// We give an overcommit time out of 1 seconds
|
||||
final int timeout = (int)TimeUnit.SECONDS.toMillis(1);
|
||||
|
||||
// Reducing to 2GB should first preempt the container
|
||||
updateNodeResource(rm, nmId, 2 * GB, 2, timeout);
|
||||
waitMemory(scheduler, nm, 4 * GB, -2 * GB, INTERVAL, timeout);
|
||||
|
||||
// wait until MARK_CONTAINER_FOR_PREEMPTION is handled
|
||||
rm.drainEvents();
|
||||
|
||||
// We should receive a notification to preempt the container
|
||||
PreemptionMessage preemptMsg = am.schedule().getPreemptionMessage();
|
||||
assertPreemption(container.getId(), preemptMsg);
|
||||
|
@ -479,6 +485,9 @@ public abstract class TestSchedulerOvercommit {
|
|||
updateNodeResource(rm, nmId, 3 * GB, 2, 2 * 1000);
|
||||
waitMemory(scheduler, nmId, 5 * GB, -2 * GB, 200, 5 * 1000);
|
||||
|
||||
// wait until MARK_CONTAINER_FOR_PREEMPTION is handled
|
||||
rm.drainEvents();
|
||||
|
||||
PreemptionMessage preemptMsg = am.schedule().getPreemptionMessage();
|
||||
assertPreemption(c2.getId(), preemptMsg);
|
||||
|
||||
|
@ -493,6 +502,9 @@ public abstract class TestSchedulerOvercommit {
|
|||
updateNodeResource(rm, nmId, 3 * GB, 2, 2 * 1000);
|
||||
waitMemory(scheduler, nmId, 5 * GB, -2 * GB, 200, 5 * 1000);
|
||||
|
||||
// wait until MARK_CONTAINER_FOR_PREEMPTION is handled
|
||||
rm.drainEvents();
|
||||
|
||||
preemptMsg = am.schedule().getPreemptionMessage();
|
||||
assertPreemption(c2.getId(), preemptMsg);
|
||||
|
||||
|
|
Loading…
Reference in New Issue