diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java index 8bee67ee819..ac14bd8b762 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java @@ -60,25 +60,10 @@ public interface MetricsHBaseServerSource extends BaseSource { String REPLICATION_QUEUE_DESC = "Number of calls in the replication call queue."; String PRIORITY_QUEUE_DESC = "Number of calls in the priority call queue."; - String WRITE_QUEUE_NAME = "numCallsInWriteQueue"; - String WRITE_QUEUE_DESC = "Number of calls in the write call queue; " + - "parsed requests waiting in scheduler to be executed"; - String READ_QUEUE_NAME = "numCallsInReadQueue"; - String READ_QUEUE_DESC = "Number of calls in the read call queue; " + - "parsed requests waiting in scheduler to be executed"; - String SCAN_QUEUE_NAME = "numCallsInScanQueue"; - String SCAN_QUEUE_DESC = "Number of calls in the scan call queue; " + - "parsed requests waiting in scheduler to be executed"; String NUM_OPEN_CONNECTIONS_NAME = "numOpenConnections"; String NUM_OPEN_CONNECTIONS_DESC = "Number of open connections."; String NUM_ACTIVE_HANDLER_NAME = "numActiveHandler"; String NUM_ACTIVE_HANDLER_DESC = "Number of active rpc handlers."; - String NUM_ACTIVE_WRITE_HANDLER_NAME = "numActiveWriteHandler"; - String NUM_ACTIVE_WRITE_HANDLER_DESC = "Number of active write rpc handlers."; - String NUM_ACTIVE_READ_HANDLER_NAME = "numActiveReadHandler"; - String NUM_ACTIVE_READ_HANDLER_DESC = "Number of active read rpc handlers."; - String NUM_ACTIVE_SCAN_HANDLER_NAME = "numActiveScanHandler"; - String NUM_ACTIVE_SCAN_HANDLER_DESC = "Number of active scan rpc handlers."; String NUM_GENERAL_CALLS_DROPPED_NAME = "numGeneralCallsDropped"; String NUM_GENERAL_CALLS_DROPPED_DESC = "Total number of calls in general queue which " + "were dropped by CoDel RPC executor"; diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java index b272cd0add4..8f30205b180 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java @@ -21,30 +21,11 @@ package org.apache.hadoop.hbase.ipc; public interface MetricsHBaseServerWrapper { long getTotalQueueSize(); - int getGeneralQueueLength(); - int getReplicationQueueLength(); - int getPriorityQueueLength(); - int getNumOpenConnections(); - int getActiveRpcHandlerCount(); - long getNumGeneralCallsDropped(); - long getNumLifoModeSwitches(); - - int getWriteQueueLength(); - - int getReadQueueLength(); - - int getScanQueueLength(); - - int getActiveWriteRpcHandlerCount(); - - int getActiveReadRpcHandlerCount(); - - int getActiveScanRpcHandlerCount(); } diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java index 69aa5fed5f9..d372b1b6ad6 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java @@ -239,19 +239,7 @@ public class MetricsHBaseServerSourceImpl extends BaseSourceImpl .addCounter(Interns.info(NUM_GENERAL_CALLS_DROPPED_NAME, NUM_GENERAL_CALLS_DROPPED_DESC), wrapper.getNumGeneralCallsDropped()) .addCounter(Interns.info(NUM_LIFO_MODE_SWITCHES_NAME, - NUM_LIFO_MODE_SWITCHES_DESC), wrapper.getNumLifoModeSwitches()) - .addGauge(Interns.info(WRITE_QUEUE_NAME, WRITE_QUEUE_DESC), - wrapper.getWriteQueueLength()) - .addGauge(Interns.info(READ_QUEUE_NAME, READ_QUEUE_DESC), - wrapper.getReadQueueLength()) - .addGauge(Interns.info(SCAN_QUEUE_NAME, SCAN_QUEUE_DESC), - wrapper.getScanQueueLength()) - .addGauge(Interns.info(NUM_ACTIVE_WRITE_HANDLER_NAME, NUM_ACTIVE_WRITE_HANDLER_DESC), - wrapper.getActiveWriteRpcHandlerCount()) - .addGauge(Interns.info(NUM_ACTIVE_READ_HANDLER_NAME, NUM_ACTIVE_READ_HANDLER_DESC), - wrapper.getActiveReadRpcHandlerCount()) - .addGauge(Interns.info(NUM_ACTIVE_SCAN_HANDLER_NAME, NUM_ACTIVE_SCAN_HANDLER_DESC), - wrapper.getActiveScanRpcHandlerCount()); + NUM_LIFO_MODE_SWITCHES_DESC), wrapper.getNumLifoModeSwitches()); } metricsRegistry.snapshot(mrb, all); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FastPathBalancedQueueRpcExecutor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FastPathBalancedQueueRpcExecutor.java index 1922f901b3c..098734e0cf9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FastPathBalancedQueueRpcExecutor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FastPathBalancedQueueRpcExecutor.java @@ -21,7 +21,6 @@ import java.util.Deque; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; @@ -58,9 +57,8 @@ public class FastPathBalancedQueueRpcExecutor extends BalancedQueueRpcExecutor { @Override protected Handler getHandler(String name, double handlerFailureThreshhold, - BlockingQueue q, AtomicInteger activeHandlerCount) { - return new FastPathHandler(name, handlerFailureThreshhold, q, activeHandlerCount, - fastPathHandlerStack); + BlockingQueue q) { + return new FastPathHandler(name, handlerFailureThreshhold, q, fastPathHandlerStack); } @Override @@ -86,9 +84,8 @@ public class FastPathBalancedQueueRpcExecutor extends BalancedQueueRpcExecutor { private CallRunner loadedCallRunner; FastPathHandler(String name, double handlerFailureThreshhold, BlockingQueue q, - final AtomicInteger activeHandlerCount, final Deque fastPathHandlerStack) { - super(name, handlerFailureThreshhold, q, activeHandlerCount); + super(name, handlerFailureThreshhold, q); this.fastPathHandlerStack = fastPathHandlerStack; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FifoRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FifoRpcScheduler.java index a9b6fd13399..70d903a6261 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FifoRpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/FifoRpcScheduler.java @@ -118,34 +118,4 @@ public class FifoRpcScheduler extends RpcScheduler { public long getNumLifoModeSwitches() { return 0; } - - @Override - public int getWriteQueueLength() { - return 0; - } - - @Override - public int getReadQueueLength() { - return 0; - } - - @Override - public int getScanQueueLength() { - return 0; - } - - @Override - public int getActiveWriteRpcHandlerCount() { - return 0; - } - - @Override - public int getActiveReadRpcHandlerCount() { - return 0; - } - - @Override - public int getActiveScanRpcHandlerCount() { - return 0; - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java index 73847878841..9979c75aebf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java @@ -94,52 +94,4 @@ public class MetricsHBaseServerWrapperImpl implements MetricsHBaseServerWrapper } return server.getScheduler().getNumLifoModeSwitches(); } - - @Override - public int getWriteQueueLength() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getWriteQueueLength(); - } - - @Override - public int getReadQueueLength() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getReadQueueLength(); - } - - @Override - public int getScanQueueLength() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getScanQueueLength(); - } - - @Override - public int getActiveWriteRpcHandlerCount() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getActiveWriteRpcHandlerCount(); - } - - @Override - public int getActiveReadRpcHandlerCount() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getActiveReadRpcHandlerCount(); - } - - @Override - public int getActiveScanRpcHandlerCount() { - if (!isServerStarted() || this.server.getScheduler() == null) { - return 0; - } - return server.getScheduler().getActiveScanRpcHandlerCount(); - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java index ef1aec8437f..fdebf0f3887 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RWQueueRpcExecutor.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.ipc; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; @@ -67,10 +66,6 @@ public class RWQueueRpcExecutor extends RpcExecutor { private final int numReadQueues; private final int numScanQueues; - private final AtomicInteger activeWriteHandlerCount = new AtomicInteger(0); - private final AtomicInteger activeReadHandlerCount = new AtomicInteger(0); - private final AtomicInteger activeScanHandlerCount = new AtomicInteger(0); - public RWQueueRpcExecutor(final String name, final int handlerCount, final int maxQueueLength, final PriorityFunction priority, final Configuration conf, final Abortable abortable) { super(name, handlerCount, maxQueueLength, priority, conf, abortable); @@ -238,13 +233,11 @@ public class RWQueueRpcExecutor extends RpcExecutor { @Override protected void startHandlers(final int port) { - startHandlers(".write", writeHandlersCount, queues, 0, numWriteQueues, port, - activeWriteHandlerCount); - startHandlers(".read", readHandlersCount, queues, numWriteQueues, numReadQueues, port, - activeReadHandlerCount); + startHandlers(".write", writeHandlersCount, queues, 0, numWriteQueues, port); + startHandlers(".read", readHandlersCount, queues, numWriteQueues, numReadQueues, port); if (numScanQueues > 0) { startHandlers(".scan", scanHandlersCount, queues, numWriteQueues + numReadQueues, - numScanQueues, port, activeScanHandlerCount); + numScanQueues, port); } } @@ -267,55 +260,6 @@ public class RWQueueRpcExecutor extends RpcExecutor { return queue.offer(callTask); } - @Override - public int getWriteQueueLength() { - int length = 0; - for (int i = 0; i < numWriteQueues; i++) { - length += queues.get(i).size(); - } - return length; - } - - @Override - public int getReadQueueLength() { - int length = 0; - for (int i = numWriteQueues; i < (numWriteQueues + numReadQueues); i++) { - length += queues.get(i).size(); - } - return length; - } - - @Override - public int getScanQueueLength() { - int length = 0; - for (int i = numWriteQueues + numReadQueues; - i < (numWriteQueues + numReadQueues + numScanQueues); i++) { - length += queues.get(i).size(); - } - return length; - } - - @Override - public int getActiveHandlerCount() { - return activeWriteHandlerCount.get() + activeReadHandlerCount.get() - + activeScanHandlerCount.get(); - } - - @Override - public int getActiveWriteHandlerCount() { - return activeWriteHandlerCount.get(); - } - - @Override - public int getActiveReadHandlerCount() { - return activeReadHandlerCount.get(); - } - - @Override - public int getActiveScanHandlerCount() { - return activeScanHandlerCount.get(); - } - private boolean isWriteRequest(final RequestHeader header, final Message param) { // TODO: Is there a better way to do this? if (param instanceof MultiRequest) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java index 15c416cfdd0..73dff89eee4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java @@ -194,6 +194,19 @@ public abstract class RpcExecutor { } } + public int getActiveHandlerCount() { + return activeHandlerCount.get(); + } + + /** Returns the length of the pending queue */ + public int getQueueLength() { + int length = 0; + for (final BlockingQueue queue: queues) { + length += queue.size(); + } + return length; + } + /** Add the request to the executor queue */ public abstract boolean dispatch(final CallRunner callTask) throws InterruptedException; @@ -204,15 +217,15 @@ public abstract class RpcExecutor { protected void startHandlers(final int port) { List> callQueues = getQueues(); - startHandlers(null, handlerCount, callQueues, 0, callQueues.size(), port, activeHandlerCount); + startHandlers(null, handlerCount, callQueues, 0, callQueues.size(), port); } /** * Override if providing alternate Handler implementation. */ protected Handler getHandler(final String name, final double handlerFailureThreshhold, - final BlockingQueue q, final AtomicInteger activeHandlerCount) { - return new Handler(name, handlerFailureThreshhold, q, activeHandlerCount); + final BlockingQueue q) { + return new Handler(name, handlerFailureThreshhold, q); } /** @@ -220,7 +233,7 @@ public abstract class RpcExecutor { */ protected void startHandlers(final String nameSuffix, final int numHandlers, final List> callQueues, final int qindex, final int qsize, - final int port, final AtomicInteger activeHandlerCount) { + final int port) { final String threadPrefix = name + Strings.nullToEmpty(nameSuffix); double handlerFailureThreshhold = conf == null ? 1.0 : conf.getDouble( HConstants.REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT, @@ -229,8 +242,7 @@ public abstract class RpcExecutor { final int index = qindex + (i % qsize); String name = "RpcServer." + threadPrefix + ".handler=" + handlers.size() + ",queue=" + index + ",port=" + port; - Handler handler = getHandler(name, handlerFailureThreshhold, callQueues.get(index), - activeHandlerCount); + Handler handler = getHandler(name, handlerFailureThreshhold, callQueues.get(index)); handler.start(); LOG.debug("Started " + name); handlers.add(handler); @@ -248,16 +260,12 @@ public abstract class RpcExecutor { final double handlerFailureThreshhold; - // metrics (shared with other handlers) - final AtomicInteger activeHandlerCount; - Handler(final String name, final double handlerFailureThreshhold, - final BlockingQueue q, final AtomicInteger activeHandlerCount) { + final BlockingQueue q) { super(name); setDaemon(true); this.q = q; this.handlerFailureThreshhold = handlerFailureThreshhold; - this.activeHandlerCount = activeHandlerCount; } /** @@ -293,7 +301,7 @@ public abstract class RpcExecutor { MonitoredRPCHandler status = RpcServer.getStatus(); cr.setStatus(status); try { - this.activeHandlerCount.incrementAndGet(); + activeHandlerCount.incrementAndGet(); cr.run(); } catch (Throwable e) { if (e instanceof Error) { @@ -316,7 +324,7 @@ public abstract class RpcExecutor { LOG.warn("Handler exception " + StringUtils.stringifyException(e)); } } finally { - this.activeHandlerCount.decrementAndGet(); + activeHandlerCount.decrementAndGet(); } } } @@ -411,43 +419,6 @@ public abstract class RpcExecutor { return numLifoModeSwitches.get(); } - public int getActiveHandlerCount() { - return activeHandlerCount.get(); - } - - public int getActiveWriteHandlerCount() { - return 0; - } - - public int getActiveReadHandlerCount() { - return 0; - } - - public int getActiveScanHandlerCount() { - return 0; - } - - /** Returns the length of the pending queue */ - public int getQueueLength() { - int length = 0; - for (final BlockingQueue queue: queues) { - length += queue.size(); - } - return length; - } - - public int getReadQueueLength() { - return 0; - } - - public int getScanQueueLength() { - return 0; - } - - public int getWriteQueueLength() { - return 0; - } - public String getName() { return this.name; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcScheduler.java index fff8373cea6..91c152bbcd1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcScheduler.java @@ -89,22 +89,4 @@ public abstract class RpcScheduler { * in the period of overloade we serve last requests first); returns 0 otherwise. */ public abstract long getNumLifoModeSwitches(); - - /** Retrieves length of the write queue for metrics when use RWQueueRpcExecutor. */ - public abstract int getWriteQueueLength(); - - /** Retrieves length of the read queue for metrics when use RWQueueRpcExecutor. */ - public abstract int getReadQueueLength(); - - /** Retrieves length of the scan queue for metrics when use RWQueueRpcExecutor. */ - public abstract int getScanQueueLength(); - - /** Retrieves the number of active write rpc handler when use RWQueueRpcExecutor. */ - public abstract int getActiveWriteRpcHandlerCount(); - - /** Retrieves the number of active write rpc handler when use RWQueueRpcExecutor. */ - public abstract int getActiveReadRpcHandlerCount(); - - /** Retrieves the number of active write rpc handler when use RWQueueRpcExecutor. */ - public abstract int getActiveScanRpcHandlerCount(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java index 683346a053b..051fba95ebc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java @@ -189,35 +189,5 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs public long getNumLifoModeSwitches() { return callExecutor.getNumLifoModeSwitches(); } - - @Override - public int getWriteQueueLength() { - return callExecutor.getWriteQueueLength(); - } - - @Override - public int getReadQueueLength() { - return callExecutor.getReadQueueLength(); - } - - @Override - public int getScanQueueLength() { - return callExecutor.getScanQueueLength(); - } - - @Override - public int getActiveWriteRpcHandlerCount() { - return callExecutor.getActiveWriteHandlerCount(); - } - - @Override - public int getActiveReadRpcHandlerCount() { - return callExecutor.getActiveReadHandlerCount(); - } - - @Override - public int getActiveScanRpcHandlerCount() { - return callExecutor.getActiveScanHandlerCount(); - } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/DelegatingRpcScheduler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/DelegatingRpcScheduler.java index 3c8f1143b94..b1b3b23e1a7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/DelegatingRpcScheduler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/DelegatingRpcScheduler.java @@ -73,34 +73,4 @@ public class DelegatingRpcScheduler extends RpcScheduler { public long getNumLifoModeSwitches() { return delegate.getNumLifoModeSwitches(); } - - @Override - public int getWriteQueueLength() { - return 0; - } - - @Override - public int getReadQueueLength() { - return 0; - } - - @Override - public int getScanQueueLength() { - return 0; - } - - @Override - public int getActiveWriteRpcHandlerCount() { - return 0; - } - - @Override - public int getActiveReadRpcHandlerCount() { - return 0; - } - - @Override - public int getActiveScanRpcHandlerCount() { - return 0; - } -} \ No newline at end of file +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java index 3b787a91dde..b001d74f7c9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperStub.java @@ -58,34 +58,4 @@ public class MetricsHBaseServerWrapperStub implements MetricsHBaseServerWrapper{ public long getNumLifoModeSwitches() { return 5; } - - @Override - public int getWriteQueueLength() { - return 50; - } - - @Override - public int getReadQueueLength() { - return 50; - } - - @Override - public int getScanQueueLength() { - return 2; - } - - @Override - public int getActiveWriteRpcHandlerCount() { - return 50; - } - - @Override - public int getActiveReadRpcHandlerCount() { - return 50; - } - - @Override - public int getActiveScanRpcHandlerCount() { - return 6; - } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java index ffcc9928e86..2b8bdd7c51f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java @@ -45,6 +45,7 @@ public class TestRpcMetrics { MetricsHBaseServer rsMetrics = new MetricsHBaseServer("HRegionServer", new MetricsHBaseServerWrapperStub()); MetricsHBaseServerSource rsSource = rsMetrics.getMetricsSource(); + assertEquals("master", masterSource.getMetricsContext()); assertEquals("regionserver", rsSource.getMetricsContext()); @@ -69,12 +70,6 @@ public class TestRpcMetrics { HELPER.assertGauge("numCallsInPriorityQueue", 104, serverSource); HELPER.assertGauge("numOpenConnections", 105, serverSource); HELPER.assertGauge("numActiveHandler", 106, serverSource); - HELPER.assertGauge("numActiveWriteHandler", 50, serverSource); - HELPER.assertGauge("numActiveReadHandler", 50, serverSource); - HELPER.assertGauge("numActiveScanHandler", 6, serverSource); - HELPER.assertGauge("numCallsInWriteQueue", 50, serverSource); - HELPER.assertGauge("numCallsInReadQueue", 50, serverSource); - HELPER.assertGauge("numCallsInScanQueue", 2, serverSource); } /**