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/2b860025 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b860025 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b860025 Branch: refs/heads/hbase-12439 Commit: 2b860025216898bb34a8e77799dd20a9a638e9c5 Parents: 5c56e23 Author: Enis Soztutar <e...@apache.org> Authored: Mon Oct 26 16:47:16 2015 -0700 Committer: Enis Soztutar <e...@apache.org> Committed: Mon Oct 26 16:47:16 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/2b860025/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);
