HubSpot Backport HBASE-29629 Record the quota user name value on metrics for RpcThrottlingExceptions (apache#7345) (#208)

Signed-off-by: Wellington Chevreuil <[email protected]>

Author: sidkhillon

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java

@@ -228,7 +228,7 @@ protected boolean isExceedThrottleQuotaEnabled() {
    * username
    * @param ugi The request's UserGroupInformation
    */
-  private String getQuotaUserName(final UserGroupInformation ugi) {
+  String getQuotaUserName(final UserGroupInformation ugi) {
     if (userOverrideRequestAttributeKey == null) {
       return ugi.getShortUserName();
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.java

@@ -199,7 +199,7 @@ public OperationQuota checkScanQuota(final Region region,
       LOG.debug("Throttling exception for user=" + ugi.getUserName() + " table=" + table + " scan="
         + scanRequest.getScannerId() + ": " + e.getMessage());
 
-      rsServices.getMetrics().recordThrottleException(e.getType(), ugi.getShortUserName(),
+      rsServices.getMetrics().recordThrottleException(e.getType(), quotaCache.getQuotaUserName(ugi),
         table.getNameAsString());
 
       throw e;
@@ -276,7 +276,7 @@ public OperationQuota checkBatchQuota(final Region region, final int numWrites,
       LOG.debug("Throttling exception for user=" + ugi.getUserName() + " table=" + table
         + " numWrites=" + numWrites + " numReads=" + numReads + ": " + e.getMessage());
 
-      rsServices.getMetrics().recordThrottleException(e.getType(), ugi.getShortUserName(),
+      rsServices.getMetrics().recordThrottleException(e.getType(), quotaCache.getQuotaUserName(ugi),
         table.getNameAsString());
 
       throw e;