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

HBASE-23237 Prevent Negative values in metrics requestsPerSecond (#865) 

Signed-off-by: Guangxu Cheng <gxcheng@apache.org>
Signed-off-by: Josh Elser <elserj@apache.org>
This commit is contained in:
Karthik Palanisamy 2019-11-23 07:13:33 -08:00 committed by Guangxu Cheng
parent ce34d895e5
commit 1fa9a8c62a
3 changed files with 146 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -379,6 +379,7 @@ public class HRegionServer extends HasThread implements
public static final String REGIONSERVER = "regionserver";
private MetricsRegionServer metricsRegionServer;
MetricsRegionServerWrapperImpl metricsRegionServerImpl;
private SpanReceiverHost spanReceiverHost;
/**
@ -1558,8 +1559,9 @@ public class HRegionServer extends HasThread implements
// Init in here rather than in constructor after thread name has been set
final MetricsTable metricsTable =
new MetricsTable(new MetricsTableWrapperAggregateImpl(this));
this.metricsRegionServer = new MetricsRegionServer(
new MetricsRegionServerWrapperImpl(this), conf, metricsTable);
this.metricsRegionServerImpl = new MetricsRegionServerWrapperImpl(this);
this.metricsRegionServer = new MetricsRegionServer(metricsRegionServerImpl,
conf, metricsTable);
// Now that we have a metrics source, start the pause monitor
this.pauseMonitor = new JvmPauseMonitor(conf, getMetrics().getMetricsSource());
pauseMonitor.start();
@ -3240,6 +3242,7 @@ public class HRegionServer extends HasThread implements
@Override
public boolean removeRegion(final HRegion r, ServerName destination) {
HRegion toReturn = this.onlineRegions.remove(r.getRegionInfo().getEncodedName());
metricsRegionServerImpl.requestsCountCache.remove(r.getRegionInfo().getEncodedName());
if (destination != null) {
long closeSeqNum = r.getMaxFlushedSeqId();
if (closeSeqNum == HConstants.NO_SEQNUM) {

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

@ -18,10 +18,13 @@
package org.apache.hadoop.hbase.regionserver;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
import java.util.OptionalLong;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@ -113,6 +116,8 @@ class MetricsRegionServerWrapperImpl
private volatile long mobFileCacheCount = 0;
private volatile long blockedRequestsCount = 0L;
private volatile long averageRegionSize = 0L;
protected final Map<String, ArrayList<Long>>
requestsCountCache = new ConcurrentHashMap<String, ArrayList<Long>>();
private ScheduledExecutorService executor;
private Runnable runnable;
@ -652,9 +657,6 @@ class MetricsRegionServerWrapperImpl
public class RegionServerMetricsWrapperRunnable implements Runnable {
private long lastRan = 0;
private long lastRequestCount = 0;
private long lastReadRequestsCount = 0;
private long lastWriteRequestsCount = 0;
@Override
synchronized public void run() {
@ -696,7 +698,40 @@ class MetricsRegionServerWrapperImpl
long tempMobScanCellsSize = 0;
long tempBlockedRequestsCount = 0;
int regionCount = 0;
long currentReadRequestsCount = 0;
long currentWriteRequestsCount = 0;
long lastReadRequestsCount = 0;
long lastWriteRequestsCount = 0;
long readRequestsDelta = 0;
long writeRequestsDelta = 0;
long totalReadRequestsDelta = 0;
long totalWriteRequestsDelta = 0;
String encodedRegionName;
for (HRegion r : regionServer.getOnlineRegionsLocalContext()) {
encodedRegionName = r.getRegionInfo().getEncodedName();
currentReadRequestsCount = r.getReadRequestsCount();
currentWriteRequestsCount = r.getWriteRequestsCount();
if (requestsCountCache.containsKey(encodedRegionName)) {
lastReadRequestsCount = requestsCountCache.get(encodedRegionName).get(0);
lastWriteRequestsCount = requestsCountCache.get(encodedRegionName).get(1);
readRequestsDelta = currentReadRequestsCount - lastReadRequestsCount;
writeRequestsDelta = currentWriteRequestsCount - lastWriteRequestsCount;
totalReadRequestsDelta += readRequestsDelta;
totalWriteRequestsDelta += writeRequestsDelta;
//Update cache for our next comparision
requestsCountCache.get(encodedRegionName).set(0,currentReadRequestsCount);
requestsCountCache.get(encodedRegionName).set(1,currentWriteRequestsCount);
} else {
// List[0] -> readRequestCount
// List[1] -> writeRequestCount
ArrayList<Long> requests = new ArrayList<Long>(2);
requests.add(currentReadRequestsCount);
requests.add(currentWriteRequestsCount);
requestsCountCache.put(encodedRegionName, requests);
totalReadRequestsDelta += currentReadRequestsCount;
totalWriteRequestsDelta += currentWriteRequestsCount;
}
tempNumMutationsWithoutWAL += r.getNumMutationsWithoutWAL();
tempDataInMemoryWithoutWAL += r.getDataInMemoryWithoutWAL();
tempReadRequestsCount += r.getReadRequestsCount();
@ -783,25 +818,14 @@ class MetricsRegionServerWrapperImpl
}
// If we've time traveled keep the last requests per second.
if ((currentTime - lastRan) > 0) {
long currentRequestCount = getTotalRowActionRequestCount();
requestsPerSecond = (currentRequestCount - lastRequestCount) /
requestsPerSecond = (totalReadRequestsDelta + totalWriteRequestsDelta) /
((currentTime - lastRan) / 1000.0);
lastRequestCount = currentRequestCount;
long intervalReadRequestsCount = tempReadRequestsCount - lastReadRequestsCount;
long intervalWriteRequestsCount = tempWriteRequestsCount - lastWriteRequestsCount;
double readRequestsRatePerMilliSecond = ((double)intervalReadRequestsCount/
(double)period);
double writeRequestsRatePerMilliSecond = ((double)intervalWriteRequestsCount/
(double)period);
double readRequestsRatePerMilliSecond = (double)totalReadRequestsDelta / period;
double writeRequestsRatePerMilliSecond = (double)totalWriteRequestsDelta / period;
readRequestsRatePerSecond = readRequestsRatePerMilliSecond * 1000.0;
writeRequestsRatePerSecond = writeRequestsRatePerMilliSecond * 1000.0;
lastReadRequestsCount = tempReadRequestsCount;
lastWriteRequestsCount = tempWriteRequestsCount;
}
lastRan = currentTime;

100
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRequestsPerSecondMetric.java Normal file
View File

@ -0,0 +1,100 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.regionserver;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
/**
* Validate requestsPerSecond metric.
*/
@Category({ RegionServerTests.class, MediumTests.class })
public class TestRequestsPerSecondMetric {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRequestsPerSecondMetric.class);
private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static final long METRICS_PERIOD = 2000L;
private static Configuration conf;
@BeforeClass
public static void setup() throws Exception {
conf = UTIL.getConfiguration();
conf.setLong(HConstants.REGIONSERVER_METRICS_PERIOD, METRICS_PERIOD);
UTIL.startMiniCluster(1);
}
@AfterClass
public static void teardown() throws Exception {
UTIL.shutdownMiniCluster();
}
@Test
/**
* This test will confirm no negative value in requestsPerSecond metric during any region
* transition(close region/remove region/move region).
* Firstly, load 2000 random rows for 25 regions and will trigger a metric.
* Now, metricCache will have a current read and write requests count.
* Next, we disable a table and all of its 25 regions will be closed.
* As part of region close, his metric will also be removed from metricCache.
* prior to HBASE-23237, we do not remove/reset his metric so we incorrectly compute
* (currentRequestCount - lastRequestCount) which result into negative value.
*
* @throws IOException
* @throws InterruptedException
*/
public void testNoNegativeSignAtRequestsPerSecond() throws IOException, InterruptedException {
final TableName TABLENAME = TableName.valueOf("t");
final String FAMILY = "f";
Admin admin = UTIL.getAdmin();
UTIL.createMultiRegionTable(TABLENAME, FAMILY.getBytes(),25);
Table table = admin.getConnection().getTable(TABLENAME);
ServerName serverName = admin.getRegionServers().iterator().next();
HRegionServer regionServer = UTIL.getMiniHBaseCluster().getRegionServer(serverName);
MetricsRegionServerWrapperImpl metricsWrapper =
new MetricsRegionServerWrapperImpl(regionServer);
MetricsRegionServerWrapperImpl.RegionServerMetricsWrapperRunnable metricsServer
= metricsWrapper.new RegionServerMetricsWrapperRunnable();
metricsServer.run();
UTIL.loadRandomRows(table, FAMILY.getBytes(), 1, 2000);
Thread.sleep(METRICS_PERIOD);
metricsServer.run();
admin.disableTable(TABLENAME);
Thread.sleep(METRICS_PERIOD);
metricsServer.run();
Assert.assertTrue(metricsWrapper.getRequestsPerSecond() > -1);
}
}