This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 0cd6ab59390 YARN-11744. Tackle flaky test
testGetRunningContainersToKill (#7227) (#7241) Contributed by Cheng Pan.
0cd6ab59390 is described below
commit 0cd6ab59390190d27eae58d349dd453b22cc858e
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Wed Dec 25 16:36:30 2024 +0800
YARN-11744. Tackle flaky test testGetRunningContainersToKill (#7227)
(#7241) Contributed by Cheng Pan.
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../resourcemanager/scheduler/TestAbstractYarnScheduler.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
index 67b3dee2b80..6404efbde0d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
@@ -1229,12 +1229,16 @@ public class TestAbstractYarnScheduler extends
ParameterizedSchedulerTestBase {
node.getContainersToKill());
}
+ private static long LAST_TIMESTAMP = 0L;
private static RMContainer newMockRMContainer(boolean isAMContainer,
ExecutionType executionType, String name) {
+ long now = Time.now();
+ while (now <= LAST_TIMESTAMP) { now = Time.now(); }
+ LAST_TIMESTAMP = now;
RMContainer container = mock(RMContainer.class);
when(container.isAMContainer()).thenReturn(isAMContainer);
when(container.getExecutionType()).thenReturn(executionType);
- when(container.getCreationTime()).thenReturn(Time.now());
+ when(container.getCreationTime()).thenReturn(now);
when(container.toString()).thenReturn(name);
return container;
}
@@ -1242,7 +1246,7 @@ public class TestAbstractYarnScheduler extends
ParameterizedSchedulerTestBase {
/**
* SchedulerNode mock to test launching containers.
*/
- class MockSchedulerNode extends SchedulerNode {
+ static class MockSchedulerNode extends SchedulerNode {
private final List<RMContainer> containers = new ArrayList<>();
MockSchedulerNode() {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
