From b3d846a94a4fae3963bc378031f6762dac33b81b Mon Sep 17 00:00:00 2001
From: "jay.zhu" <jay.zhu@huolala.cn>
Date: Fri, 5 May 2023 16:19:53 +0800
Subject: [PATCH] HBASE-27845 Distinguish the mutate type of rpc error in
 MetricsConnection

---
 .../hbase/client/TestMetricsConnection.java   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java
index 704ce751ebc..92f5e65e36a 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMetricsConnection.java
@@ -177,8 +177,8 @@ public class TestMetricsConnection {
       METRICS.updateRpc(ClientService.getDescriptor().findMethodByName("Mutate"),
         MutateRequest.newBuilder()
           .setMutation(ProtobufUtil.toMutation(MutationType.PUT, new Put(foo))).setRegion(region)
-          .build(),
-        MetricsConnection.newCallStats(), null);
+          .build(), MetricsConnection.newCallStats(),
+        new CallTimeoutException("test with CallTimeoutException"));
     }
 
     final String rpcCountPrefix = "rpcCount_" + ClientService.getDescriptor().getName() + "_";
@@ -211,11 +211,16 @@ public class TestMetricsConnection {
       metricVal = METRICS.getRpcCounters().get(metricKey).getCount();
       assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == loop);
 
-      metricKey = rpcFailureCountPrefix + method;
+      metricKey = rpcFailureCountPrefix + method + "(" + mutationType + ")";
       counter = METRICS.getRpcCounters().get(metricKey);
       metricVal = (counter != null) ? counter.getCount() : 0;
-      // no failure
-      assertTrue("metric: " + metricKey + " val: " + metricVal, metricVal == 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
@@ -228,13 +233,13 @@ public class TestMetricsConnection {
     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);
 
     // 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);
 
     for (MetricsConnection.CallTracker t : new MetricsConnection.CallTracker[] {
       METRICS.getGetTracker(), METRICS.getScanTracker(), METRICS.getMultiTracker(),