You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/02/22 17:47:07 UTC
[2/2] hbase git commit: Revert "HBASE-2004 TestClientClusterStatus is
flakey" Revert to fix JIRA number; should be 20044.
Revert "HBASE-2004 TestClientClusterStatus is flakey"
Revert to fix JIRA number; should be 20044.
This reverts commit 92bb4db9ef367039029017aafe61c51f2c0181f9.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3d2e9e21
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3d2e9e21
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3d2e9e21
Branch: refs/heads/master
Commit: 3d2e9e2125ec29c6959c98157ad378d5c53f911d
Parents: 11af33a
Author: Michael Stack <st...@apache.org>
Authored: Thu Feb 22 09:41:27 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Thu Feb 22 09:44:04 2018 -0800
----------------------------------------------------------------------
.../hadoop/hbase/TestClientClusterStatus.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3d2e9e21/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
----------------------------------------------------------------------
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 392ff6e..bfdae8a 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,7 +37,6 @@ 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;
@@ -101,14 +100,13 @@ public class TestClientClusterStatus {
@Test
public void testNone() throws Exception {
- 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));
+ 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);
}
@Test