You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2016/08/04 02:50:18 UTC
[3/5] hbase git commit: HBASE-16350 Undo server abort from HBASE-14968
HBASE-16350 Undo server abort from HBASE-14968
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/16adb066
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/16adb066
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/16adb066
Branch: refs/heads/branch-1.3
Commit: 16adb0667c49644ac36772d0ec63e558052c9e5f
Parents: 57f8ad8
Author: Enis Soztutar <en...@apache.org>
Authored: Wed Aug 3 19:37:58 2016 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Wed Aug 3 19:40:07 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/executor/EventHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/16adb066/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
index 73fd7f2..a418e11 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
@@ -226,7 +226,7 @@ public abstract class EventHandler implements Runnable, Comparable<Runnable> {
protected void handleException(Throwable t) {
String msg = "Caught throwable while processing event " + eventType;
LOG.error(msg, t);
- if (server != null) {
+ if (server != null && (t instanceof Error || t instanceof RuntimeException)) {
server.abort(msg, t);
}
}