Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-2004 TestClientClusterStatus is flakey" 

Revert to fix JIRA number; should be 20044.

This reverts commit 92bb4db9ef.
This commit is contained in:
Michael Stack 2018-02-22 09:41:27 -08:00
parent 38a97b87e6
commit 6796b8e21f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
View File

@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
import org.apache.hadoop.hbase.util.Threads;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -101,14 +100,13 @@ public class TestClientClusterStatus {
@Test @Test
public void testNone() throws Exception { public void testNone() throws Exception {
ClusterMetrics status0 = ADMIN.getClusterMetrics(EnumSet.allOf(Option.class)); ClusterStatus status0
ClusterMetrics status1 = ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class)); = new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.allOf(Option.class)));
// Do a rough compare. More specific compares can fail because all regions not deployed yet ClusterStatus status1
// or more requests than expected. = new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class)));
Assert.assertEquals(status0.getLiveServerMetrics().size(), Assert.assertEquals(status0, status1);
status1.getLiveServerMetrics().size()); checkPbObjectNotNull(status0);
checkPbObjectNotNull(new ClusterStatus(status0)); checkPbObjectNotNull(status1);
checkPbObjectNotNull(new ClusterStatus(status1));
} }
@Test @Test