Added the real RPC to the HBaseException if one is thrown from a Mult…

…iAction RPC. Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>
OpenTSDB · Sep 17, 2016 · 22120c1 · 22120c1
1 parent d9587c9
commit 22120c1
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/RegionClient.java b/src/RegionClient.java
@@ -896,9 +896,18 @@ public Object call(final Object resp) {
 
       private Object handleException(final Exception e) {
         if (!(e instanceof RecoverableException)) {
-          for (final BatchableRpc rpc : request.batch()) {
-            rpc.callback(e);
+
+          if (e instanceof HBaseException){
+            HBaseException ex = (HBaseException)e;
+            for (final BatchableRpc rpc : request.batch()) {
+              rpc.callback(ex.make(ex, rpc));
+            }
+          } else{
+            for (final BatchableRpc rpc : request.batch()) {
+              rpc.callback(e);
+            }
           }
+
           return e;  // Can't recover from this error, let it propagate.
         }
         if (LOG.isDebugEnabled()) {