Repository: hadoop Updated Branches: refs/heads/branch-2 9eda3ce3f -> 1f28703d9 refs/heads/trunk 452079af8 -> 447764374
HDFS-9072. Fix random failures in TestJMXGet. (J.Andreina via stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f28703d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f28703d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f28703d Branch: refs/heads/branch-2 Commit: 1f28703d936873ce5ecf08091862af7afa6f0340 Parents: 9eda3ce Author: Steve Loughran <[email protected]> Authored: Wed Sep 16 10:08:18 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Sep 16 10:08:18 2015 +0100 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/tools/TestJMXGet.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f28703d/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 44fb985..c5f83f5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1005,6 +1005,9 @@ Release 2.8.0 - UNRELEASED HDFS-9067. o.a.h.hdfs.server.datanode.fsdataset.impl.TestLazyWriter is failing in trunk (Surendra Singh Lilhore via vinayakumarb) + HDFS-9072. Fix random failures in TestJMXGet. + (J.Andreina via stevel) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f28703d/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java index c69e73a..aef18fb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java @@ -114,10 +114,12 @@ public class TestJMXGet { assertTrue("error printAllValues", checkPrintAllValues(jmx)); //get some data from different source + DFSTestUtil.waitForMetric(jmx, "NumLiveDataNodes", numDatanodes); assertEquals(numDatanodes, Integer.parseInt( jmx.getValue("NumLiveDataNodes"))); assertGauge("CorruptBlocks", Long.parseLong(jmx.getValue("CorruptBlocks")), getMetrics("FSNamesystem")); + DFSTestUtil.waitForMetric(jmx, "NumOpenConnections", numDatanodes); assertEquals(numDatanodes, Integer.parseInt( jmx.getValue("NumOpenConnections"))); @@ -161,6 +163,7 @@ public class TestJMXGet { String serviceName = "DataNode"; jmx.setService(serviceName); jmx.init(); + DFSTestUtil.waitForMetric(jmx, "BytesWritten", fileSize); assertEquals(fileSize, Integer.parseInt(jmx.getValue("BytesWritten"))); cluster.shutdown();
