From 3a3994223c5d634bdd7ef01ef7f31ff860849575 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 21 Feb 2018 14:52:10 -0800 Subject: [PATCH] HBASE-2004 TestClientClusterStatus is flakey --- .../hadoop/hbase/TestClientClusterStatus.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java index bfdae8af399..392ff6e4435 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; +import org.apache.hadoop.hbase.util.Threads; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -100,13 +101,14 @@ public class TestClientClusterStatus { @Test public void testNone() throws Exception { - ClusterStatus status0 - = new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.allOf(Option.class))); - ClusterStatus status1 - = new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class))); - Assert.assertEquals(status0, status1); - checkPbObjectNotNull(status0); - checkPbObjectNotNull(status1); + ClusterMetrics status0 = ADMIN.getClusterMetrics(EnumSet.allOf(Option.class)); + ClusterMetrics status1 = ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class)); + // Do a rough compare. More specific compares can fail because all regions not deployed yet + // or more requests than expected. + Assert.assertEquals(status0.getLiveServerMetrics().size(), + status1.getLiveServerMetrics().size()); + checkPbObjectNotNull(new ClusterStatus(status0)); + checkPbObjectNotNull(new ClusterStatus(status1)); } @Test