[07/17] hbase git commit: HBASE-14682 CM restore functionality for regionservers is broken

[syuanjiang]

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 
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar 
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 toStart = new TreeSet(new 
ServerNameIgnoreStartCodeComparator());
 Set toKill = new TreeSet(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);

hbase git commit: HBASE-14682 CM restore functionality for regionservers is broken

[enis]

Repository: hbase
Updated Branches:
  refs/heads/master 5c56e239c -> 2b8600252


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/master
Commit: 2b860025216898bb34a8e77799dd20a9a638e9c5
Parents: 5c56e23
Author: Enis Soztutar 
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar 
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 toStart = new TreeSet(new 
ServerNameIgnoreStartCodeComparator());
 Set toKill = new TreeSet(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);

[2/2] hbase git commit: HBASE-14682 CM restore functionality for regionservers is broken

[enis]

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 
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar 
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 toStart = new TreeSet(new 
ServerNameIgnoreStartCodeComparator());
 Set toKill = new TreeSet(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);

[1/2] hbase git commit: HBASE-14682 CM restore functionality for regionservers is broken

[enis]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 288a27405 -> 1128c855a
  refs/heads/branch-1.2 0fd37a5bf -> df79b281b


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/1128c855
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1128c855
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1128c855

Branch: refs/heads/branch-1
Commit: 1128c855ad97a9f44f61b112089330d8256e1b75
Parents: 288a274
Author: Enis Soztutar 
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar 
Committed: Mon Oct 26 16:47:21 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/1128c855/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 toStart = new TreeSet(new 
ServerNameIgnoreStartCodeComparator());
 Set toKill = new TreeSet(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);

[1/2] hbase git commit: HBASE-14682 CM restore functionality for regionservers is broken

[enis]

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 
Authored: Mon Oct 26 16:47:16 2015 -0700
Committer: Enis Soztutar 
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 toStart = new TreeSet(new 
ServerNameIgnoreStartCodeComparator());
 Set toKill = new TreeSet(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);