apply patch OpenTSDB#202

Author: kai33

src/RegionClient.java

@@ -1547,6 +1547,7 @@ protected Object decode(final ChannelHandlerContext ctx,
       final class RetryTimer implements TimerTask {
         public void run(final Timeout timeout) {
           if (isAlive()) {
+            rpc.attempt++;
             sendRpc(rpc);
           } else {
             if (rpc instanceof MultiAction) {

src/UnknownScannerException.java

@@ -29,7 +29,7 @@
 /**
  * Exception thrown when we try to use an invalid or expired scanner ID.
  */
-public final class UnknownScannerException extends RecoverableException
+public final class UnknownScannerException extends NonRecoverableException
 implements HasFailedRpcException {
 
   static final String REMOTE_CLASS =