From 7aade932c7587050c75825b083ff2cc61150b201 Mon Sep 17 00:00:00 2001 From: Ahmed Hussein Date: Wed, 6 May 2020 12:27:17 -0500 Subject: [PATCH] YARN-8959. TestContainerResizing fails randomly (Ahmed Hussein via jeagles) Signed-off-by: Jonathan Eagles (cherry picked from commit 92e3ebb40199aec0890b868b8d6bf2d7fe90abbf) --- .../scheduler/capacity/TestContainerResizing.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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/capacity/TestContainerResizing.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java index c1b1c52ede..e3c6e7c68b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java @@ -224,7 +224,7 @@ protected Dispatcher createDispatcher() { verifyContainerDecreased(response, containerId1, 1 * GB); // Wait for scheduler to finish processing kill events.. - dispatcher.waitForEventThreadToWait(); + dispatcher.await(); checkUsedResource(rm1, "default", 1 * GB, null); Assert.assertEquals(1 * GB, @@ -657,7 +657,7 @@ protected Dispatcher createDispatcher() { // Trigger a node heartbeat.. cs.handle(new NodeUpdateSchedulerEvent(rmNode1)); - dispatcher.waitForEventThreadToWait(); + dispatcher.await(); /* Check statuses after reservation satisfied */ // Increase request should be unreserved Assert.assertTrue(app.getReservedContainers().isEmpty()); @@ -774,7 +774,7 @@ protected Dispatcher createDispatcher() { am1.allocate(null, null); // Wait for scheduler to process all events. - dispatcher.waitForEventThreadToWait(); + dispatcher.await(); /* Check statuses after reservation satisfied */ // Increase request should be unreserved