HBASE-16616 Rpc handlers stuck on ThreadLocalMap.expungeStaleEntry (Tomu Tsuruhara)

hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java

@@ -181,6 +181,10 @@ public class Counter {
     return sum;
   }
 
+  public void destroy() {
+    indexHolderThreadLocal.remove();
+  }
+
   @Override
   public String toString() {
     Cell[] cells = containerRef.get().cells;

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

@@ -2003,6 +2003,7 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
           LOG.trace(ignored);
         }
       }
+      rpcCount.destroy();
     }
 
     private UserGroupInformation createUser(ConnectionHeader head) {