Amend HBASE-5162 Basic client pushback mechanism (Jesse Yates)

Applied hbase-5162-trunk-addendum.patch

hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.java

@@ -90,11 +90,14 @@ public class RpcRetryingCallerFactory {
     String clazzName = RpcRetryingCallerFactory.class.getName();
     String rpcCallerFactoryClazz =
         configuration.get(RpcRetryingCallerFactory.CUSTOM_CALLER_CONF_KEY, clazzName);
+    RpcRetryingCallerFactory factory;
     if (rpcCallerFactoryClazz.equals(clazzName)) {
-      return new RpcRetryingCallerFactory(configuration, interceptor);
+      factory = new RpcRetryingCallerFactory(configuration, interceptor);
+    } else {
+      factory = ReflectionUtils.instantiateWithCustomCtor(
+          rpcCallerFactoryClazz, new Class[] { Configuration.class },
+          new Object[] { configuration });
     }
-    RpcRetryingCallerFactory factory = ReflectionUtils.instantiateWithCustomCtor(
-        rpcCallerFactoryClazz, new Class[] { Configuration.class }, new Object[] { configuration });
 
     // setting for backwards compat with existing caller factories, rather than in the ctor
     factory.setStatisticTracker(stats);

hbase-client/src/main/java/org/apache/hadoop/hbase/client/StatsTrackingRpcRetryingCaller.java

@@ -64,7 +64,7 @@ public class StatsTrackingRpcRetryingCaller<T> implements RpcRetryingCaller<T> {
 
     // mutli-server callables span multiple regions, so they don't have a location,
     // but they are region server callables, so we have to handle them when we process the
-    // result, not in here
+    // result in AsyncProcess#receiveMultiAction, not in here
     if (callable instanceof MultiServerCallable) {
       return result;
     }

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java

@@ -50,8 +50,7 @@ public class TestClientPushback {
     conf.setBoolean(HConstants.ENABLE_CLIENT_BACKPRESSURE, true);
     // turn the memstore size way down so we don't need to write a lot to see changes in memstore
     // load
-    conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE,
-        flushSizeBytes);
+    conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, flushSizeBytes);
     // ensure we block the flushes when we are double that flushsize
     conf.setLong("hbase.hregion.memstore.block.multiplier", 2);
 
@@ -65,10 +64,11 @@ public class TestClientPushback {
   }
 
   @Test
-  public void testClientTrackesServerPushback() throws Exception{
+  public void testClientTracksServerPushback() throws Exception{
     Configuration conf = UTIL.getConfiguration();
     TableName tablename = TableName.valueOf(tableName);
-    HTable table = new HTable(conf, tablename);
+    Connection conn = ConnectionFactory.createConnection(conf);
+    HTable table = (HTable) conn.getTable(tablename);
     //make sure we flush after each put
     table.setAutoFlushTo(true);
 
@@ -78,8 +78,8 @@ public class TestClientPushback {
     table.put(p);
 
     // get the stats for the region hosting our table
-    ClusterConnection conn = ConnectionManager.getConnectionInternal(conf);
-    ServerStatisticTracker stats = conn.getStatisticsTracker();
+    ClusterConnection connection = table.connection;
+    ServerStatisticTracker stats = connection.getStatisticsTracker();
     assertNotNull( "No stats configured for the client!", stats);
     // get the names so we can query the stats
     ServerName server = UTIL.getHBaseCluster().getRegionServer(0).getServerName();