Repository: hbase Updated Branches: refs/heads/master 7b3291fa8 -> 078a6be7d
Revert "HBASE-Fix client.TestClientClusterStatus (Chia-Ping Tsai)" Revert because missing JIRA number This reverts commit 7b3291fa8b836be9539817876799994fac5de335. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fbbae877 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fbbae877 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fbbae877 Branch: refs/heads/master Commit: fbbae8774ca3162245c0d883c9f477f7d92bc8a5 Parents: 7b3291f Author: Michael Stack <st...@apache.org> Authored: Mon Aug 21 14:38:22 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Mon Aug 21 14:38:22 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/client/TestClientClusterStatus.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fbbae877/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java index 484ee06..49b4ff2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java @@ -65,7 +65,7 @@ public class TestClientClusterStatus { RegionServerThread rst = rsts.get(rsts.size() - 1); DEAD = rst.getRegionServer(); DEAD.stop("Test dead servers status"); - while (rst.isAlive()) { + while (!DEAD.isStopped()) { Thread.sleep(500); } } @@ -155,11 +155,9 @@ public class TestClientClusterStatus { Assert.assertNotNull(status); Assert.assertNotNull(status.getServers()); // exclude a dead region server - Assert.assertEquals(SLAVES -1, numRs); - // live servers = nums of regionservers - // By default, HMaster don't carry any regions so it won't report its load. - // Hence, it won't be in the server list. - Assert.assertEquals(status.getServers().size(), numRs); + Assert.assertEquals(SLAVES, numRs); + // live servers = primary master + nums of regionservers + Assert.assertEquals(status.getServers().size() + 1 /*Master*/, numRs); Assert.assertTrue(status.getRegionsCount() > 0); Assert.assertNotNull(status.getDeadServerNames()); Assert.assertEquals(1, status.getDeadServersSize());