You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/10/26 03:25:24 UTC
hbase git commit: Revert "HBASE-21380 Completed SCPs shouldn't add to
dead servers in processing"
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 4b8c7c14f -> 601f8955f
Revert "HBASE-21380 Completed SCPs shouldn't add to dead servers in processing"
This reverts commit 4b8c7c14f54fd5bb40d5fffcaddb4efe6b0ccac2.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/601f8955
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/601f8955
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/601f8955
Branch: refs/heads/branch-2.0
Commit: 601f8955f9e8a96ad909caa6997983d24c7fac5b
Parents: 4b8c7c1
Author: Michael Stack <st...@apache.org>
Authored: Thu Oct 25 20:25:12 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu Oct 25 20:25:12 2018 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/master/HMaster.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/601f8955/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 3f0dc1f..af0e189 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,11 +860,9 @@ 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 && !p.isFinished())
- .map(p -> ((ServerCrashProcedure) p).getServerName())
- .collect(Collectors.toSet()),
- walManager.getLiveServersFromWALDir());
+ procedureExecutor.getProcedures().stream().filter(p -> p instanceof ServerCrashProcedure)
+ .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.