Repository: hbase Updated Branches: refs/heads/branch-2.0 f891e5675 -> 4b8c7c14f
HBASE-21380 Completed SCPs shouldn't add to dead servers in processing Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b8c7c14 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b8c7c14 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b8c7c14 Branch: refs/heads/branch-2.0 Commit: 4b8c7c14f54fd5bb40d5fffcaddb4efe6b0ccac2 Parents: f891e56 Author: Mike Drob <[email protected]> Authored: Thu Oct 25 11:02:33 2018 -0500 Committer: Michael Stack <[email protected]> Committed: Thu Oct 25 20:14:55 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4b8c7c14/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 af0e189..3f0dc1f 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 @@ -860,9 +860,11 @@ public class HMaster extends HRegionServer implements MasterServices { this.assignmentManager.start(); 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()), - walManager.getLiveServersFromWALDir()); + procedureExecutor.getProcedures().stream() + .filter(p -> p instanceof ServerCrashProcedure && !p.isFinished()) + .map(p -> ((ServerCrashProcedure) p).getServerName()) + .collect(Collectors.toSet()), + walManager.getLiveServersFromWALDir()); // 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 // state from zookeeper while hbase2 reads it from hbase:meta. Disable if no hbase1 clients.
