Repository: hbase Updated Branches: refs/heads/branch-1.1 0db04a170 -> 42144bdcf
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/42144bdc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/42144bdc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/42144bdc Branch: refs/heads/branch-1.1 Commit: 42144bdcf780d1350377d01db8485ebff8604dca Parents: e80b447 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 17:37:09 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/42144bdc/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);
