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

HBASE-18469 Correct RegionServer metric of totalRequestCount

Browse Source
This commit is contained in:
Yu Li 2017-08-11 14:13:18 +08:00
parent d72ba890d9
commit a03c2036e9
8 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
View File

@ -244,6 +244,9 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo
String TOTAL_REQUEST_COUNT = "totalRequestCount";
String TOTAL_REQUEST_COUNT_DESC =
"Total number of requests this RegionServer has answered.";
String TOTAL_ROW_ACTION_REQUEST_COUNT = "totalRowActionRequestCount";
String TOTAL_ROW_ACTION_REQUEST_COUNT_DESC =
"Total number of region requests this RegionServer has answered, count by row-level action";
String READ_REQUEST_COUNT = "readRequestCount";
String READ_REQUEST_COUNT_DESC =
"Number of read requests this region server has answered.";

2
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
View File

@ -367,4 +367,6 @@ public interface MetricsRegionServerWrapper {
long getDeleteFamilyBloomHitCount();
long getTrailerHitCount();
long getTotalRowActionRequestCount();
}

2
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
View File

@ -354,6 +354,8 @@ public class MetricsRegionServerSourceImpl
.addGauge(Interns.info(AVERAGE_REGION_SIZE, AVERAGE_REGION_SIZE_DESC), rsWrap.getAverageRegionSize())
.addCounter(Interns.info(TOTAL_REQUEST_COUNT, TOTAL_REQUEST_COUNT_DESC),
rsWrap.getTotalRequestCount())
.addCounter(Interns.info(TOTAL_ROW_ACTION_REQUEST_COUNT, TOTAL_ROW_ACTION_REQUEST_COUNT_DESC),
rsWrap.getTotalRowActionRequestCount())
.addCounter(Interns.info(READ_REQUEST_COUNT, READ_REQUEST_COUNT_DESC),
rsWrap.getReadRequestsCount())
.addCounter(Interns.info(WRITE_REQUEST_COUNT, WRITE_REQUEST_COUNT_DESC),

5
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java
View File

@ -173,6 +173,11 @@ class MetricsRegionServerWrapperImpl
return regionServer.rpcServices.requestCount.get();
}
@Override
public long getTotalRowActionRequestCount() {
return regionServer.rpcServices.requestRowActionCount.get();
}
@Override
public int getSplitQueueSize() {
if (this.regionServer.compactSplitThread == null) {

15
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
View File

@ -235,9 +235,13 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
*/
static final int BATCH_ROWS_THRESHOLD_DEFAULT = 5000;
// Request counter. (Includes requests that are not serviced by regions.)
// Count only once for requests with multiple actions like multi/caching-scan/replayBatch
final Counter requestCount = new Counter();
// Request counter. (Excludes requests that are not serviced by regions.)
// Count rows for requests with multiple actions like multi/caching-scan/replayBatch
final Counter requestRowActionCount = new Counter();
// Request counter for rpc get
final Counter rpcGetRequestCount = new Counter();
@ -988,7 +992,8 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
it.remove();
}
}
requestCount.add(mutations.size());
requestCount.increment();
requestRowActionCount.add(mutations.size());
if (!region.getRegionInfo().isMetaTable()) {
regionServer.cacheFlusher.reclaimMemStoreMemory();
}
@ -2191,6 +2196,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
try {
checkOpen();
requestCount.increment();
requestRowActionCount.increment();
rpcGetRequestCount.increment();
Region region = getRegion(request.getRegion());
@ -2305,10 +2311,11 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
Boolean processed = null;
this.rpcMultiRequestCount.increment();
this.requestCount.increment();
Map<RegionSpecifier, ClientProtos.RegionLoadStats> regionStats = new HashMap<>(request
.getRegionActionCount());
for (RegionAction regionAction : request.getRegionActionList()) {
this.requestCount.add(regionAction.getActionCount());
this.requestRowActionCount.add(regionAction.getActionCount());
OperationQuota quota;
Region region;
regionActionResultBuilder.clear();
@ -2433,6 +2440,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
try {
checkOpen();
requestCount.increment();
requestRowActionCount.increment();
rpcMutateRequestCount.increment();
Region region = getRegion(request.getRegion());
MutateResponse.Builder builder = MutateResponse.newBuilder();
@ -2870,6 +2878,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
}
}
region.updateReadRequestsCount(numOfResults);
requestRowActionCount.add(numOfResults);
long end = EnvironmentEdgeManager.currentTime();
long responseCellSize = context != null ? context.getResponseCellSize() : 0;
region.getMetrics().updateScanTime(end - before);

5
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java
View File

@ -100,6 +100,11 @@ public class MetricsRegionServerWrapperStub implements MetricsRegionServerWrappe
return 899;
}
@Override
public long getTotalRowActionRequestCount() {
return getReadRequestsCount() + getWriteRequestsCount();
}
@Override
public long getReadRequestsCount() {
return 997;

4
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java
View File

@ -71,6 +71,10 @@ public class TestMetricsRegionServer {
HELPER.assertGauge("memstoreSize", 1025, serverSource);
HELPER.assertGauge("storeFileSize", 1900, serverSource);
HELPER.assertCounter("totalRequestCount", 899, serverSource);
HELPER.assertCounter("totalRowActionRequestCount",
HELPER.getCounter("readRequestCount", serverSource)
+ HELPER.getCounter("writeRequestCount", serverSource),
serverSource);
HELPER.assertCounter("readRequestCount", 997, serverSource);
HELPER.assertCounter("writeRequestCount", 707, serverSource);
HELPER.assertCounter("checkMutateFailedCount", 401, serverSource);

41
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
View File

@ -124,6 +124,7 @@ public class TestRegionServerMetrics {
metricsRegionServer.getRegionServerWrapper().forceRecompute();
long requests = metricsHelper.getCounter("totalRequestCount", serverSource);
long rowActionRequests = metricsHelper.getCounter("totalRowActionRequestCount", serverSource);
long readRequests = metricsHelper.getCounter("readRequestCount", serverSource);
long writeRequests = metricsHelper.getCounter("writeRequestCount", serverSource);
@ -133,6 +134,7 @@ public class TestRegionServerMetrics {
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 30, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 30, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 30, serverSource);
@ -143,6 +145,7 @@ public class TestRegionServerMetrics {
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 40, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 40, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests + 10, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 30, serverSource);
@ -170,27 +173,59 @@ public class TestRegionServerMetrics {
// By default, master doesn't host meta now.
// Adding some meta related requests
requests += 1;
rowActionRequests += 1;
readRequests ++;
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 50, serverSource);
metricsHelper.assertCounter("totalRequestCount", requests + 41, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 50, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests + 20, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 30, serverSource);
List<Put> puts = new ArrayList<>();
for (int i=0; i< 30; i++) {
puts.add(p);
// put multiple lines for latter scan
Put put = new Put(Bytes.toBytes("" + i + "row")).addColumn(cfName, qualifier, initValue);
puts.add(put);
}
table.put(puts);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 80, serverSource);
metricsHelper.assertCounter("totalRequestCount", requests + 42, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 80, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests + 20, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 60, serverSource);
doScan(table, 10, false);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 52, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 90, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests + 30, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 60, serverSource);
doScan(table, 10, true);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
metricsHelper.assertCounter("totalRequestCount", requests + 53, serverSource);
metricsHelper.assertCounter("totalRowActionRequestCount", rowActionRequests + 100, serverSource);
metricsHelper.assertCounter("readRequestCount", readRequests + 40, serverSource);
metricsHelper.assertCounter("writeRequestCount", writeRequests + 60, serverSource);
table.close();
}
public void doScan(Table table, int n, boolean caching) throws IOException {
Scan scan = new Scan();
if (caching) {
scan.setCaching(n);
} else {
scan.setCaching(1);
}
ResultScanner scanner = table.getScanner(scan);
for (int i = 0; i < n; i++) {
scanner.next();
}
}
@Test
public void testGet() throws Exception {
String tableNameString = "testGet";