Repository: hbase Updated Branches: refs/heads/0.98 f8c45d755 -> ee344b27f
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/ee344b27 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ee344b27 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ee344b27 Branch: refs/heads/0.98 Commit: ee344b27f0dca133584ecab29c10db60ce56b7cd Parents: f8c45d7 Author: Enis Soztutar <[email protected]> Authored: Wed Aug 3 19:37:58 2016 -0700 Committer: Enis Soztutar <[email protected]> Committed: Wed Aug 3 19:50:49 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/ee344b27/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 078c55d..a7cd7de 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); } }
