HBASE-27799: fix misleading RpcThrottlingException message

apache · Apr 19, 2023 · 94fe90a · 94fe90a
1 parent 143e9b4
commit 94fe90a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
@@ -130,10 +130,19 @@ public static void throwWriteCapacityUnitExceeded(final long waitInterval)
 
   private static void throwThrottlingException(final Type type, final long waitInterval)
     throws RpcThrottlingException {
-    String msg = MSG_TYPE[type.ordinal()] + MSG_WAIT + StringUtils.formatTime(waitInterval);
+    String msg = MSG_TYPE[type.ordinal()] + MSG_WAIT + stringFromMillis(waitInterval);
     throw new RpcThrottlingException(type, waitInterval, msg);
   }
 
+  private static String stringFromMillis(long millis) {
+    if (millis >= 1000) {
+      return StringUtils.formatTime(millis);
+    } else {
+      // StringUtils#formatTime doesn't support millis
+      return millis + "ms";
+    }
+  }
+
   private static long timeFromString(String timeDiff) {
     Pattern[] patterns = new Pattern[] { Pattern.compile("^(\\d+\\.\\d\\d)sec"),
       Pattern.compile("^(\\d+)mins, (\\d+\\.\\d\\d)sec"),