Skip to content
Permalink
Browse files
HBASE-27032 The draining region servers metric description is incorre…
…ct (#4428)

Signed-off-by: Xiaolin Ha <haxiaolin@apache.org>
Signed-off-by: Pankaj Kumar<pankajkumar@apache.org>
  • Loading branch information
tomscut committed May 17, 2022
1 parent ad64a9b commit ed1665355a221f9f36ce7c8905d9ed063c6e9eac
Showing 2 changed files with 10 additions and 2 deletions.
@@ -121,7 +121,8 @@ public void getMetrics(MetricsCollector metricsCollector, boolean all) {
masterWrapper.getNumDeadRegionServers())
.tag(Interns.info(DRAINING_REGION_SERVER_NAME, DRAINING_REGION_SERVER_DESC),
masterWrapper.getDrainingRegionServers())
.addGauge(Interns.info(NUM_DRAINING_REGION_SERVERS_NAME, NUMBER_OF_REGION_SERVERS_DESC),
.addGauge(
Interns.info(NUM_DRAINING_REGION_SERVERS_NAME, NUMBER_OF_DRAINING_REGION_SERVERS_DESC),
masterWrapper.getNumDrainingRegionServers())
.tag(Interns.info(ZOOKEEPER_QUORUM_NAME, ZOOKEEPER_QUORUM_DESC),
masterWrapper.getZookeeperQuorum())
@@ -20,6 +20,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import java.io.IOException;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
@@ -70,7 +71,7 @@ public static void teardown() throws Exception {
}

@Test
public void testInfo() {
public void testInfo() throws IOException {
HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
MetricsMasterWrapperImpl info = new MetricsMasterWrapperImpl(master);
assertEquals(master.getRegionNormalizerManager().getSplitPlanCount(), info.getSplitPlanCount(),
@@ -107,6 +108,12 @@ public void testInfo() {
// now we do not expose this information as WALProcedureStore is not the only ProcedureStore
// implementation any more.
assertEquals(0, info.getNumWALFiles());
// We decommission the first online region server and verify the metrics.
TEST_UTIL.getMiniHBaseCluster().getMaster().decommissionRegionServers(
master.getServerManager().getOnlineServersList().subList(0, 1), false);
assertEquals(1, info.getNumDrainingRegionServers());
assertEquals(master.getServerManager().getOnlineServersList().get(0).toString(),
info.getDrainingRegionServers());
}

@Test

0 comments on commit ed16653

Please sign in to comment.