Skip to content

Commit 6264556

Browse files
authored
YARN-11744. Tackle flaky test testGetRunningContainersToKill (#7227) Contributed by Cheng Pan.
Signed-off-by: Shilun Fan <[email protected]>
1 parent fc42da7 commit 6264556

File tree

1 file changed

+6
-2
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler

1 file changed

+6
-2
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -1584,20 +1584,24 @@ public void testGetRunningContainersToKill() {
15841584
node.getContainersToKill());
15851585
}
15861586

1587+
private static long LAST_TIMESTAMP = 0L;
15871588
private static RMContainer newMockRMContainer(boolean isAMContainer,
15881589
ExecutionType executionType, String name) {
1590+
long now = Time.now();
1591+
while (now <= LAST_TIMESTAMP) { now = Time.now(); }
1592+
LAST_TIMESTAMP = now;
15891593
RMContainer container = mock(RMContainer.class);
15901594
when(container.isAMContainer()).thenReturn(isAMContainer);
15911595
when(container.getExecutionType()).thenReturn(executionType);
1592-
when(container.getCreationTime()).thenReturn(Time.now());
1596+
when(container.getCreationTime()).thenReturn(now);
15931597
when(container.toString()).thenReturn(name);
15941598
return container;
15951599
}
15961600

15971601
/**
15981602
* SchedulerNode mock to test launching containers.
15991603
*/
1600-
class MockSchedulerNode extends SchedulerNode {
1604+
static class MockSchedulerNode extends SchedulerNode {
16011605
private final List<RMContainer> containers = new ArrayList<>();
16021606

16031607
MockSchedulerNode() {

0 commit comments

Comments
 (0)