From 461e1e7e9ad4d23eaeef63b3934d9c168f82e2e7 Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Wed, 20 Feb 2019 15:52:35 +0530 Subject: [PATCH] YARN-9315 --- .../server/resourcemanager/TestCapacitySchedulerMetrics.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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/TestCapacitySchedulerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestCapacitySchedulerMetrics.java index eaa966a..d9ab8d6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestCapacitySchedulerMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestCapacitySchedulerMetrics.java @@ -87,18 +87,18 @@ public RMNodeLabelsManager createNodeLabelManager() { nm1.nodeHeartbeat(true); nm2.nodeHeartbeat(true); - // Verify HB metrics updated try { + // Verify HB metrics updated GenericTestUtils.waitFor(() -> csMetrics.getNumOfNodeUpdate() == 4, 100, 3000); + // For async mode, the number of alloc might be bigger than 1 + Assert.assertTrue(csMetrics.getNumOfAllocates() > 0); + // But there will be only 2 successful commit (1 AM + 1 task) + GenericTestUtils.waitFor(() + -> csMetrics.getNumOfCommitSuccess() == 2, 100, 3000); } catch(TimeoutException e) { Assert.fail("CS metrics not updated on node-update events."); } - - // For async mode, the number of alloc might be bigger than 1 - Assert.assertTrue(csMetrics.getNumOfAllocates() > 0); - // But there will be only 2 successful commit (1 AM + 1 task) - Assert.assertEquals(2, csMetrics.getNumOfCommitSuccess()); } @After -- 2.7.4 (Apple Git-66)