Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-27845 Distinguish the mutate types of rpc error in MetricsConnection. #5224

Merged
merged 9 commits into from
Jul 6, 2023
Merged

HBASE-27845 Distinguish the mutate types of rpc error in MetricsConnection. #5224

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e0109d
In trace log mode, the client does not print callId/startTime and the…
Aug 16, 2022
c906356
HBASE-27268 In trace log mode, the client does not print callId/start…
Aug 17, 2022
ecd1dbb
Merge remote-tracking branch 'origin/master'
Feb 17, 2023
ebad877
Merge branch 'master' of github.com:zhuyaogai/hbase
Mar 6, 2023
bca7caa
Merge remote-tracking branch 'origin/master'
May 4, 2023
5e8d1c1
HBASE-27845 Distinguish the mutate type of rpc error in MetricsConnec…
May 5, 2023
b3d846a
HBASE-27845 Distinguish the mutate type of rpc error in MetricsConnec…
May 5, 2023
ef0ce71
run spotless:apply to fix.
May 5, 2023
b04e455
HBASE-27845 Distinguish the mutate types of rpc error in MetricsConne…
May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,27 @@ public void updateRpc(MethodDescriptor method, Message param, CallStats stats, T
concurrentCallsPerServerHist.update(callsPerServer);
}
// Update the counter that tracks RPCs by type.
final String methodName = method.getService().getName() + "_" + method.getName();
String methodName = method.getService().getName() + "_" + method.getName();
zhuyaogai marked this conversation as resolved.
Show resolved Hide resolved
// Distinguish mutate types.
if ("Mutate".equals(method.getName())) {
final MutationType type = ((MutateRequest) param).getMutation().getMutateType();
switch (type) {
case APPEND:
methodName += "(Append)";
break;
case DELETE:
methodName += "(Delete)";
break;
case INCREMENT:
methodName += "(Increment)";
break;
case PUT:
methodName += "(Put)";
break;
default:
throw new RuntimeException("Unrecognized mutation type " + type);
zhuyaogai marked this conversation as resolved.
Show resolved Hide resolved
}
}
getMetric(CNT_BASE + methodName, rpcCounters, counterFactory).inc();
if (e != null) {
getMetric(FAILURE_CNT_BASE + methodName, rpcCounters, counterFactory).inc();
Expand Down
31 changes: 25 additions & 6 deletions hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ public void testStaticMetrics() throws IOException {
MutateRequest.newBuilder()
.setMutation(ProtobufUtil.toMutation(MutationType.PUT, new Put(foo))).setRegion(region)
.build(),
MetricsConnection.newCallStats(), null);
MetricsConnection.newCallStats(),
new CallTimeoutException("test with CallTimeoutException"));
zhuyaogai marked this conversation as resolved.
Show resolved Hide resolved
}

final String rpcCountPrefix = "rpcCount_" + ClientService.getDescriptor().getName() + "_";
Expand All @@ -188,15 +189,15 @@ public void testStaticMetrics() throws IOException {
long metricVal;
Counter counter;

for (String method : new String[] { "Get", "Scan", "Multi", "Mutate" }) {
for (String method : new String[] { "Get", "Scan", "Multi" }) {
metricKey = rpcCountPrefix + method;
metricVal = METRICS.getRpcCounters().get(metricKey).getCount();
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal >= loop);
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop);

metricKey = rpcFailureCountPrefix + method;
counter = METRICS.getRpcCounters().get(metricKey);
metricVal = (counter != null) ? counter.getCount() : 0;
if (method.equals("Get") || method.equals("Mutate")) {
if (method.equals("Get")) {
// no failure
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == 0);
} else {
Expand All @@ -205,6 +206,24 @@ public void testStaticMetrics() throws IOException {
}
}

String method = "Mutate";
for (String mutationType : new String[] { "Append", "Delete", "Increment", "Put" }) {
metricKey = rpcCountPrefix + method + "(" + mutationType + ")";
metricVal = METRICS.getRpcCounters().get(metricKey).getCount();
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop);

metricKey = rpcFailureCountPrefix + method + "(" + mutationType + ")";
counter = METRICS.getRpcCounters().get(metricKey);
metricVal = (counter != null) ? counter.getCount() : 0;
if (mutationType.equals("Put")) {
// no failure
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop);
} else {
// has failure
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == 0);
}
}

// remote exception
metricKey = "rpcRemoteExceptions_IOException";
counter = METRICS.getRpcCounters().get(metricKey);
Expand All @@ -215,13 +234,13 @@ public void testStaticMetrics() throws IOException {
metricKey = "rpcLocalExceptions_CallTimeoutException";
counter = METRICS.getRpcCounters().get(metricKey);
metricVal = (counter != null) ? counter.getCount() : 0;
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop);
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop * 2);
zhuyaogai marked this conversation as resolved.
Show resolved Hide resolved

// total exception
metricKey = "rpcTotalExceptions";
counter = METRICS.getRpcCounters().get(metricKey);
metricVal = (counter != null) ? counter.getCount() : 0;
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop * 2);
assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop * 3);
zhuyaogai marked this conversation as resolved.
Show resolved Hide resolved

for (MetricsConnection.CallTracker t : new MetricsConnection.CallTracker[] {
METRICS.getGetTracker(), METRICS.getScanTracker(), METRICS.getMultiTracker(),
Expand Down