backport

Author: Ray Mattingly

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestAtomicReadQuota.java

@@ -18,12 +18,13 @@
 package org.apache.hadoop.hbase.quotas;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
@@ -51,7 +52,7 @@ public class TestAtomicReadQuota {
   public static final HBaseClassTestRule CLASS_RULE =
     HBaseClassTestRule.forClass(TestAtomicReadQuota.class);
   private static final Logger LOG = LoggerFactory.getLogger(TestAtomicReadQuota.class);
-  private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
+  private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
   private static final TableName TABLE_NAME = TableName.valueOf(UUID.randomUUID().toString());
   private static final byte[] FAMILY = Bytes.toBytes("cf");
   private static final byte[] QUALIFIER = Bytes.toBytes("q");
@@ -181,7 +182,7 @@ public void testAtomicBatchCountedAgainstReadCapacity() throws Exception {
     incs.add(inc);
 
     testThrottle(table -> {
-      Object[] results = new Object[] {};
+      Object[] results = new Object[incs.size()];
       table.batch(incs, results);
       return results;
     });
@@ -210,7 +211,10 @@ private void testThrottle(ThrowingFunction<Table, ?> request) throws Exception {
           request.run(table);
           return false;
         } catch (Exception e) {
-          boolean success = e.getCause() instanceof RpcThrottlingException;
+          // a SocketTimeoutException is possible because multis do not yet appropriately handle
+          // RpcThrottlingExceptions
+          boolean success =
+            e.getCause() instanceof RpcThrottlingException || e instanceof SocketTimeoutException;
           if (!success) {
             LOG.error("Unexpected exception", e);
           }