You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/07/11 21:57:36 UTC
[1/2] hbase git commit: HBASE-20651 Master,
prevents hbck or shell command to reassign the split parent region
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 <es...@apache.org>
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 <hs...@cloudera.com>
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
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
Posted by ap...@apache.org.
HBASE-20651 Master, prevents hbck or shell command to reassign the split parent region
Signed-off-by: Esteban Gutierrez <es...@apache.org>
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 <hs...@cloudera.com>
Authored: Tue Jul 10 16:05:57 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
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);
}