HBASE-21380 Completed SCPs shouldn't add to dead servers in processing

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Mike Drob 2018-10-25 11:02:33 -05:00 committed by Michael Stack
parent 7c3033d704
commit 1add6e9ca4
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2

View File

@ -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