You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2019/04/11 22:15:30 UTC

[hadoop] branch trunk updated: HDDS-1410. TestSCMNodeMetrics is flaky. Contributed by Siddharth Wagle.

This is an automated email from the ASF dual-hosted git repository.

arp pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new fcc7f9b  HDDS-1410. TestSCMNodeMetrics is flaky. Contributed by Siddharth Wagle.
fcc7f9b is described below

commit fcc7f9b32ff5fa5883bb01fad0f55b28ba17733d
Author: Arpit Agarwal <ar...@apache.org>
AuthorDate: Thu Apr 11 15:14:28 2019 -0700

    HDDS-1410. TestSCMNodeMetrics is flaky. Contributed by Siddharth Wagle.
---
 .../java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
index 3a8f9f0..65a6357 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
@@ -101,9 +101,9 @@ public class TestSCMNodeMetrics {
     NodeReportProto nodeReport = NodeReportProto.newBuilder()
         .addStorageReport(storageReport).build();
     datanode.getDatanodeStateMachine().getContext().addReport(nodeReport);
-    datanode.getDatanodeStateMachine().triggerHeartbeat();
-    // Give some time so that SCM receives and processes the heartbeat.
-    Thread.sleep(100L);
+    cluster.getStorageContainerManager().getScmNodeManager()
+        .processNodeReport(datanode.getDatanodeDetails(), nodeReport);
+
     assertCounter("NumNodeReportProcessed", nrProcessed + 1,
         getMetrics(SCMNodeMetrics.class.getSimpleName()));
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org