HBASE-14290 Spin up less threads in tests

hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java

@@ -86,8 +86,9 @@ public class AsyncCall extends DefaultPromise<Message> {
 
   @Override
   public String toString() {
-    return "callId: " + this.id + " methodName: " + this.method.getName() + " param {"
-        + (this.param != null ? ProtobufUtil.getShortTextFormat(this.param) : "") + "}";
+    return "callId=" + this.id + ", method=" + this.method.getName() +
+      ", rpcTimeout=" + this.rpcTimeout + ", param {" +
+      (this.param != null ? ProtobufUtil.getShortTextFormat(this.param) : "") + "}";
   }
 
   /**

hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java

@@ -146,10 +146,10 @@ public class AsyncRpcChannel {
 
     this.channel = connect(bootstrap).channel();
 
-    name = ("IPC Client (" + channel.hashCode() + ") connection to " +
+    name = ("IPC Client (" + channel.hashCode() + ") to " +
         address.toString() +
         ((ticket == null) ?
-            " from an unknown user" :
+            " from unknown user" :
             (" from " + ticket.getName())));
   }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java

@@ -611,7 +611,7 @@ public class RpcServer implements RpcServerInterface {
         readers[i] = reader;
         readPool.execute(reader);
       }
-      LOG.info(getName() + ": started " + readThreads + " reader(s).");
+      LOG.info(getName() + ": started " + readThreads + " reader(s) listening on port=" + port);
 
       // Register accepts on the server socket with the selector.
       acceptChannel.register(selector, SelectionKey.OP_ACCEPT);

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

@@ -69,7 +69,6 @@ public class TestCloneSnapshotFromClient {
     TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
     TEST_UTIL.getConfiguration().setBoolean(
         "hbase.master.enabletable.roundrobin", true);
-    TEST_UTIL.getConfiguration().setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
     TEST_UTIL.startMiniCluster(3);
   }
 

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

@@ -1,5 +1,6 @@
 /**
  *
+
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -131,9 +132,9 @@ public class TestDistributedLogSplitting {
 
   }
 
-  // Start a cluster with 2 masters and 6 regionservers
+  // Start a cluster with 2 masters and 5 regionservers
   static final int NUM_MASTERS = 2;
-  static final int NUM_RS = 6;
+  static final int NUM_RS = 5;
 
   MiniHBaseCluster cluster;
   HMaster master;
@@ -167,7 +168,6 @@ public class TestDistributedLogSplitting {
     conf.setInt(HConstants.REGIONSERVER_INFO_PORT, -1);
     conf.setFloat(HConstants.LOAD_BALANCER_SLOP_KEY, (float) 100.0); // no load balancing
     conf.setInt("hbase.regionserver.wal.max.splitters", 3);
-    conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
     TEST_UTIL.shutdownMiniHBaseCluster();
     TEST_UTIL = new HBaseTestingUtility(conf);
     TEST_UTIL.setDFSCluster(dfsCluster);

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java

@@ -68,7 +68,6 @@ public class  TestRollingRestart {
     // Start the cluster
     log("Starting cluster");
     Configuration conf = HBaseConfiguration.create();
-    conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
     HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(conf);
     TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);
     MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java

@@ -111,7 +111,6 @@ public class TestRegionReplicaFailover {
     conf.setInt("replication.stats.thread.period.seconds", 5);
     conf.setBoolean("hbase.tests.use.shortcircuit.reads", false);
     conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, distributedLogReplay);
-    conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 60);
 
     HTU.startMiniCluster(NB_SERVERS);
     htd = HTU.createTableDescriptor(

hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java

@@ -83,7 +83,6 @@ public class TestExportSnapshot {
     conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
     conf.setBoolean("hbase.master.enabletable.roundrobin", true);
     conf.setInt("mapreduce.map.maxattempts", 10);
-    conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 40);
   }
 
   @BeforeClass

hbase-server/src/test/resources/hbase-site.xml

@@ -50,6 +50,14 @@
     <name>hbase.regionserver.handler.count</name>
     <value>5</value>
   </property>
+  <property>
+    <name>hbase.regionserver.metahandler.count</name>
+    <value>5</value>
+  </property>
+  <property>
+      <name>hbase.ipc.server.read.threadpool.size</name>
+    <value>3</value>
+  </property>
   <property>
     <name>hbase.master.info.port</name>
     <value>-1</value>