Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java (revision 1588358) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java (working copy) @@ -123,6 +123,8 @@ Mockito.when(c.getNonceGenerator()).thenReturn(ng); Mockito.when(c.getAsyncProcess()).thenReturn(new AsyncProcess( c, conf, null, RpcRetryingCallerFactory.instantiate(conf), false)); + Mockito.doNothing().when(c).incCount(); + Mockito.doNothing().when(c).decCount(); return c; } Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java (revision 1588358) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java (working copy) @@ -474,8 +474,6 @@ // package protected for the tests ClusterStatusListener clusterStatusListener; - private final Object userRegionLock = new Object(); - // We have a single lock for master & zk to prevent deadlocks. Having // one lock for ZK and one lock for master is not possible: // When creating a connection to master, we need a connection to ZK to get