hbase git commit: HBASE-20651 Master, prevents hbck or shell command to reassign the split parent region

2018-07-11 Thread apurtell 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 d54931688 -> c0477e714


HBASE-20651 Master, prevents hbck or shell command to reassign the split parent 
region

Signed-off-by: Esteban Gutierrez 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c0477e71
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c0477e71
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c0477e71

Branch: refs/heads/branch-1.2
Commit: c0477e714433d603be6e019d2eb2a5fc9c7028b6
Parents: d549316
Author: Huaxiang Sun 
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Jul 11 14:57:47 2018 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c0477e71/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 9e2d6c6..e859dac 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1546,6 +1546,11 @@ public class AssignmentManager extends ZooKeeperListener 
{
* @param regionInfo
*/
   public void regionOffline(final HRegionInfo regionInfo) {
+if (regionStates.isRegionInState(regionInfo, State.MERGED, State.SPLIT)) {
+  LOG.info("Try to offline region " + regionInfo.getEncodedName() +
+  ", which is at state " + 
regionStates.getRegionState(regionInfo).getState() + ", skip");
+  return;
+}
 regionOffline(regionInfo, null);
   }

[1/2] hbase git commit: HBASE-20651 Master, prevents hbck or shell command to reassign the split parent region

2018-07-11 Thread apurtell 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 3fb612549 -> 2568abe31
  refs/heads/branch-1.4 43dc18450 -> 55883ef89


HBASE-20651 Master, prevents hbck or shell command to reassign the split parent 
region

Signed-off-by: Esteban Gutierrez 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/55883ef8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/55883ef8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/55883ef8

Branch: refs/heads/branch-1.4
Commit: 55883ef898106ea24bde32ab1f8c73af7d20e13d
Parents: 43dc184
Author: Huaxiang Sun 
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Jul 11 11:43:45 2018 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/55883ef8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 6dec3ce..4d7c030 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1623,6 +1623,11 @@ public class AssignmentManager extends ZooKeeperListener 
{
* @param regionInfo
*/
   public void regionOffline(final HRegionInfo regionInfo) {
+if (regionStates.isRegionInState(regionInfo, State.MERGED, State.SPLIT)) {
+  LOG.info("Try to offline region " + regionInfo.getEncodedName() +
+  ", which is at state " + 
regionStates.getRegionState(regionInfo).getState() + ", skip");
+  return;
+}
 regionOffline(regionInfo, null);
   }

[2/2] hbase git commit: HBASE-20651 Master, prevents hbck or shell command to reassign the split parent region

2018-07-11 Thread apurtell 
HBASE-20651 Master, prevents hbck or shell command to reassign the split parent 
region

Signed-off-by: Esteban Gutierrez 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2568abe3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2568abe3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2568abe3

Branch: refs/heads/branch-1.3
Commit: 2568abe310ae49c5443c77c66b344420825c7e4f
Parents: 3fb6125
Author: Huaxiang Sun 
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Andrew Purtell 
Committed: Wed Jul 11 11:44:00 2018 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2568abe3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index bf77dbf..63ef5ff 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1595,6 +1595,11 @@ public class AssignmentManager extends ZooKeeperListener 
{
* @param regionInfo
*/
   public void regionOffline(final HRegionInfo regionInfo) {
+if (regionStates.isRegionInState(regionInfo, State.MERGED, State.SPLIT)) {
+  LOG.info("Try to offline region " + regionInfo.getEncodedName() +
+  ", which is at state " + 
regionStates.getRegionState(regionInfo).getState() + ", skip");
+  return;
+}
 regionOffline(regionInfo, null);
   }

hbase git commit: HBASE-20651 Master, prevents hbck or shell command to reassign the split parent region

2018-07-10 Thread huaxiangsun 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 0953eb7ed -> f2dc754aa


HBASE-20651 Master, prevents hbck or shell command to reassign the split parent 
region

Signed-off-by: Esteban Gutierrez 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f2dc754a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f2dc754a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f2dc754a

Branch: refs/heads/branch-1
Commit: f2dc754aa398fdaf4d8ef37e4bfbef3853dbae7a
Parents: 0953eb7
Author: Huaxiang Sun 
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Huaxiang Sun 
Committed: Tue Jul 10 16:07:30 2018 -0700

--
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f2dc754a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index d9345d8..a039e6a 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1632,6 +1632,11 @@ public class AssignmentManager extends ZooKeeperListener 
{
* @param regionInfo
*/
   public void regionOffline(final HRegionInfo regionInfo) {
+if (regionStates.isRegionInState(regionInfo, State.MERGED, State.SPLIT)) {
+  LOG.info("Try to offline region " + regionInfo.getEncodedName() +
+  ", which is at state " + 
regionStates.getRegionState(regionInfo).getState() + ", skip");
+  return;
+}
 regionOffline(regionInfo, null);
   }