From 06cf8955f89d083d80480a5bd42cbad097a97774 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Thu, 25 Oct 2018 11:02:33 -0500 Subject: [PATCH] HBASE-21380 Completed SCPs shouldn't add to dead servers in processing --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 e8a9ef86ba..cd2055286b 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 -- 2.16.1