Repository: hbase Updated Branches: refs/heads/branch-2.1 7c3033d70 -> 1add6e9ca
HBASE-21380 Completed SCPs shouldn't add to dead servers in processing Signed-off-by: Michael Stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1add6e9c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1add6e9c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1add6e9c Branch: refs/heads/branch-2.1 Commit: 1add6e9ca4404590616d9c36db2699f7f68a7c00 Parents: 7c3033d Author: Mike Drob <[email protected]> Authored: Thu Oct 25 11:02:33 2018 -0500 Committer: Michael Stack <[email protected]> Committed: Thu Oct 25 19:18:15 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1add6e9c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index e8a9ef8..cd20552 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -902,8 +902,10 @@ public class HMaster extends HRegionServer implements MasterServices { // TODO: Generate the splitting and live Set in one pass instead of two as we currently do. this.regionServerTracker = new RegionServerTracker(zooKeeper, this, this.serverManager); this.regionServerTracker.start( - procedureExecutor.getProcedures().stream().filter(p -> p instanceof ServerCrashProcedure) - .map(p -> ((ServerCrashProcedure) p).getServerName()).collect(Collectors.toSet()), + procedureExecutor.getProcedures().stream() + .filter(p -> p instanceof ServerCrashProcedure && !p.isFinished()) + .map(p -> ((ServerCrashProcedure) p).getServerName()) + .collect(Collectors.toSet()), walManager.getLiveServersFromWALDir(), walManager.getSplittingServersFromWALDir()); // This manager will be started AFTER hbase:meta is confirmed on line. // hbase.mirror.table.state.to.zookeeper is so hbase1 clients can connect. They read table
