You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/10/27 01:03:14 UTC
[2/2] hbase git commit: HBASE-14682 CM restore functionality for
regionservers is broken
HBASE-14682 CM restore functionality for regionservers is broken
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/df79b281
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df79b281
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df79b281
Branch: refs/heads/branch-1.2
Commit: df79b281ba8954ac8563016ac25fe56f067a98b1
Parents: 0fd37a5
Author: Enis Soztutar <en...@apache.org>
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Mon Oct 26 16:48:32 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/DistributedHBaseCluster.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/df79b281/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
index 07ca5ec..62f5c66 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
@@ -431,8 +431,8 @@ public class DistributedHBaseCluster extends HBaseCluster {
protected boolean restoreRegionServers(ClusterStatus initial, ClusterStatus current) {
Set<ServerName> toStart = new TreeSet<ServerName>(new ServerNameIgnoreStartCodeComparator());
Set<ServerName> toKill = new TreeSet<ServerName>(new ServerNameIgnoreStartCodeComparator());
- toStart.addAll(initial.getBackupMasters());
- toKill.addAll(current.getBackupMasters());
+ toStart.addAll(initial.getServers());
+ toKill.addAll(current.getServers());
for (ServerName server : current.getServers()) {
toStart.remove(server);