Repository: hbase Updated Branches: refs/heads/0.98 b4b1b9c46 -> 81e6831af
Amend HBASE-12787 Backport HBASE-12028 (Abort the RegionServer when it's handler threads die) to 0.98 (Alicia Ying Shu); Fix Hadoop 1 build Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/81e6831a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/81e6831a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/81e6831a Branch: refs/heads/0.98 Commit: 81e6831af812a02742a9ae76d0fa184eb7255719 Parents: b4b1b9c Author: Andrew Purtell <[email protected]> Authored: Fri Jan 9 19:21:25 2015 -0800 Committer: Andrew Purtell <[email protected]> Committed: Fri Jan 9 19:21:25 2015 -0800 ---------------------------------------------------------------------- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/81e6831a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 0d7d680..269a285 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -859,7 +859,7 @@ public final class HConstants { */ public static final String REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT = "hbase.regionserver.handler.abort.on.error.percent"; - public static final double DEFAULT_REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT = -1; + public static final float DEFAULT_REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT = -1; public static final String REGION_SERVER_META_HANDLER_COUNT = "hbase.regionserver.metahandler.count"; http://git-wip-us.apache.org/repos/asf/hbase/blob/81e6831a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java index bb6fdf2..a82f007 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcExecutor.java @@ -119,7 +119,7 @@ public abstract class RpcExecutor { protected void consumerLoop(final BlockingQueue<CallRunner> myQueue) { boolean interrupted = false; double handlerFailureThreshhold = - conf == null ? 1.0 : conf.getDouble(HConstants.REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT, + conf == null ? 1.0 : conf.getFloat(HConstants.REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT, HConstants.DEFAULT_REGION_SERVER_HANDLER_ABORT_ON_ERROR_PERCENT); try { while (running) {
