You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/09/04 03:38:30 UTC

[5/6] hbase git commit: HBASE-14359 HTable#close will hang forever if unchecked error/exception thrown in AsyncProcess#sendMultiAction (Victor Xu)

HBASE-14359 HTable#close will hang forever if unchecked error/exception thrown in AsyncProcess#sendMultiAction (Victor Xu)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0564bfc8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0564bfc8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0564bfc8

Branch: refs/heads/branch-1.0
Commit: 0564bfc81a7b035eb49a3d016d094ce9ab2ebb90
Parents: 9b3e4bc
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Sep 3 17:48:45 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Sep 3 17:49:35 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/client/AsyncProcess.java       | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/0564bfc8/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index c72fb0f..b4dc7a3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -954,15 +954,20 @@ class AsyncProcess {
           } else {
             try {
               pool.submit(runnable);
-            } catch (RejectedExecutionException ree) {
-              // This should never happen. But as the pool is provided by the end user, let's secure
-              //  this a little.
+            } catch (Throwable t) {
+              if (t instanceof RejectedExecutionException) {
+                // This should never happen. But as the pool is provided by the end user,
+               // let's secure this a little.
+               LOG.warn("#" + id + ", the task was rejected by the pool. This is unexpected." +
+                  " Server is " + server.getServerName(), t);
+              } else {
+                // see #HBASE-14359 for more details
+                LOG.warn("Caught unexpected exception/error: ", t);
+              }
               decTaskCounters(multiAction.getRegions(), server);
-              LOG.warn("#" + id + ", the task was rejected by the pool. This is unexpected." +
-                  " Server is " + server.getServerName(), ree);
-              // We're likely to fail again, but this will increment the attempt counter, so it will
-              //  finish.
-              receiveGlobalFailure(multiAction, server, numAttempt, ree);
+              // We're likely to fail again, but this will increment the attempt counter,
+             // so it will finish.
+              receiveGlobalFailure(multiAction, server, numAttempt, t);
             }
           }
         }