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/5db0f8fb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5db0f8fb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5db0f8fb Branch: refs/heads/branch-1.1 Commit: 5db0f8fb94446e7dce362da5a1843c2b1c6ef0ec Parents: 140f4e7 Author: Enis Soztutar <[email protected]> Authored: Wed Aug 3 19:37:58 2016 -0700 Committer: Enis Soztutar <[email protected]> Committed: Wed Aug 3 19:43:37 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/5db0f8fb/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); } }
