Repository: hbase Updated Branches: refs/heads/branch-1 dbd10eee3 -> d14ec7132 refs/heads/branch-1.1 140f4e7a7 -> 5db0f8fb9 refs/heads/branch-1.2 e1f6de747 -> 5c111942b refs/heads/branch-1.3 57f8ad8d9 -> 16adb0667 refs/heads/master 39db239d4 -> 81b06b3bd
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/81b06b3b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/81b06b3b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/81b06b3b Branch: refs/heads/master Commit: 81b06b3bdd56c1c434406fe3e3aea7e47948f958 Parents: 39db239 Author: Enis Soztutar <[email protected]> Authored: Wed Aug 3 19:37:58 2016 -0700 Committer: Enis Soztutar <[email protected]> Committed: Wed Aug 3 19:37:58 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/81b06b3b/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 ba4bee9..ca1ce9e 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 @@ -186,7 +186,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); } }
