You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vi...@apache.org on 2017/08/28 09:52:26 UTC
hbase git commit: HBASE-18633 Add more info to understand the
source/scenario of large batch requests exceeding threshold
Repository: hbase
Updated Branches:
refs/heads/master d63a287bf -> 4e7f67717
HBASE-18633 Add more info to understand the source/scenario of large batch requests exceeding threshold
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4e7f6771
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4e7f6771
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4e7f6771
Branch: refs/heads/master
Commit: 4e7f67717033afb46aac045a8ca81dbd2140bc9e
Parents: d63a287
Author: Vikas Vishwakarma <vv...@salesforce.com>
Authored: Wed Aug 23 11:34:10 2017 +0530
Committer: Vikas Vishwakarma <vi...@apache.org>
Committed: Mon Aug 28 15:20:21 2017 +0530
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/RSRpcServices.java | 13 +++++++++----
.../hbase/regionserver/TestMultiLogThreshold.java | 8 ++++----
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4e7f6771/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 7fc025a..707321d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -1131,16 +1131,17 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
// Exposed for testing
static interface LogDelegate {
- void logBatchWarning(int sum, int rowSizeWarnThreshold);
+ void logBatchWarning(String firstRegionName, int sum, int rowSizeWarnThreshold);
}
private static LogDelegate DEFAULT_LOG_DELEGATE = new LogDelegate() {
@Override
- public void logBatchWarning(int sum, int rowSizeWarnThreshold) {
+ public void logBatchWarning(String firstRegionName, int sum, int rowSizeWarnThreshold) {
if (LOG.isWarnEnabled()) {
LOG.warn("Large batch operation detected (greater than " + rowSizeWarnThreshold
+ ") (HBASE-18023)." + " Requested Number of Rows: " + sum + " Client: "
- + RpcServer.getRequestUserName() + "/" + RpcServer.getRemoteAddress());
+ + RpcServer.getRequestUserName() + "/" + RpcServer.getRemoteAddress()
+ + " first region in multi=" + firstRegionName);
}
}
};
@@ -2513,11 +2514,15 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
private void checkBatchSizeAndLogLargeSize(MultiRequest request) {
int sum = 0;
+ String firstRegionName = null;
for (RegionAction regionAction : request.getRegionActionList()) {
+ if (sum == 0) {
+ firstRegionName = Bytes.toStringBinary(regionAction.getRegion().getValue().toByteArray());
+ }
sum += regionAction.getActionCount();
}
if (sum > rowSizeWarnThreshold) {
- ld.logBatchWarning(sum, rowSizeWarnThreshold);
+ ld.logBatchWarning(firstRegionName, sum, rowSizeWarnThreshold);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/4e7f6771/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.java
index 6a5dc64..e18e8dd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.java
@@ -117,25 +117,25 @@ public class TestMultiLogThreshold {
@Test
public void testMultiLogThresholdRegionActions() throws ServiceException, IOException {
sendMultiRequest(THRESHOLD + 1, ActionType.REGION_ACTIONS);
- verify(LD, Mockito.times(1)).logBatchWarning(Mockito.anyInt(), Mockito.anyInt());
+ verify(LD, Mockito.times(1)).logBatchWarning(Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt());
}
@Test
public void testMultiNoLogThresholdRegionActions() throws ServiceException, IOException {
sendMultiRequest(THRESHOLD, ActionType.REGION_ACTIONS);
- verify(LD, Mockito.never()).logBatchWarning(Mockito.anyInt(), Mockito.anyInt());
+ verify(LD, Mockito.never()).logBatchWarning(Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt());
}
@Test
public void testMultiLogThresholdActions() throws ServiceException, IOException {
sendMultiRequest(THRESHOLD + 1, ActionType.ACTIONS);
- verify(LD, Mockito.times(1)).logBatchWarning(Mockito.anyInt(), Mockito.anyInt());
+ verify(LD, Mockito.times(1)).logBatchWarning(Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt());
}
@Test
public void testMultiNoLogThresholdAction() throws ServiceException, IOException {
sendMultiRequest(THRESHOLD, ActionType.ACTIONS);
- verify(LD, Mockito.never()).logBatchWarning(Mockito.anyInt(), Mockito.anyInt());
+ verify(LD, Mockito.never()).logBatchWarning(Mockito.anyString(), Mockito.anyInt(), Mockito.anyInt());
}
}