hbase git commit: HBASE-20202 [AMv2] Don't move region if its a split parent or offlined
Repository: hbase Updated Branches: refs/heads/branch-2.0 a2fccc36e -> a18fb33d5 HBASE-20202 [AMv2] Don't move region if its a split parent or offlined M hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java M hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java Allow passing cause to Constructor. M hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto Add prepare step to move procedure. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java Add check that regions to merge are actually online to the Constructor so we can fail fast if they are offline M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java Add prepare step. Check regions and context and skip move if not right. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java Add check parent region is online to constructor. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java Add generic check region is online utility function for use by subclasses. M hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMove.java Add test that we fail if we try to move an offlined region. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a18fb33d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a18fb33d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a18fb33d Branch: refs/heads/branch-2.0 Commit: a18fb33d522a9a20ebdb589c2b9036ee5a15da34 Parents: a2fccc3 Author: Michael StackAuthored: Thu Mar 15 13:33:27 2018 -0700 Committer: Michael Stack Committed: Fri Mar 16 09:35:13 2018 -0700 -- .../hbase/client/DoNotRetryRegionException.java | 3 ++ .../hbase/exceptions/MergeRegionException.java | 4 +++ .../src/main/protobuf/MasterProcedure.proto | 1 + .../org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../assignment/MergeTableRegionsProcedure.java | 24 ++- .../master/assignment/MoveRegionProcedure.java | 11 +++ .../assignment/SplitTableRegionProcedure.java | 3 ++ .../AbstractStateMachineTableProcedure.java | 31 .../hbase/namespace/TestNamespaceAuditor.java | 8 - .../TestRegionMergeTransactionOnCluster.java| 8 ++--- .../hbase/regionserver/TestRegionMove.java | 14 + .../TestSplitTransactionOnCluster.java | 12 ++-- 12 files changed, 104 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a18fb33d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java index 06a0b3d..61ad5cd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java @@ -37,4 +37,7 @@ public class DoNotRetryRegionException extends DoNotRetryIOException { super(s); } + public DoNotRetryRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/a18fb33d/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java index e690084..5399f07 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java @@ -42,4 +42,8 @@ public class MergeRegionException extends DoNotRetryRegionException { public MergeRegionException(String s) { super(s); } + + public MergeRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/a18fb33d/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 8f03a9f..7415cbf 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++
hbase git commit: HBASE-20202 [AMv2] Don't move region if its a split parent or offlined
Repository: hbase Updated Branches: refs/heads/master 22f4def94 -> 13f3ba3ce HBASE-20202 [AMv2] Don't move region if its a split parent or offlined M hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java M hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java Allow passing cause to Constructor. M hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto Add prepare step to move procedure. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java Add check that regions to merge are actually online to the Constructor so we can fail fast if they are offline M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java Add prepare step. Check regions and context and skip move if not right. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java Add check parent region is online to constructor. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java Add generic check region is online utility function for use by subclasses. M hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMove.java Add test that we fail if we try to move an offlined region. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13f3ba3c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13f3ba3c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13f3ba3c Branch: refs/heads/master Commit: 13f3ba3cee4d8a358c3c5ba653fc12643f000aa7 Parents: 22f4def Author: Michael StackAuthored: Thu Mar 15 13:33:27 2018 -0700 Committer: Michael Stack Committed: Fri Mar 16 09:35:33 2018 -0700 -- .../hbase/client/DoNotRetryRegionException.java | 3 ++ .../hbase/exceptions/MergeRegionException.java | 4 +++ .../src/main/protobuf/MasterProcedure.proto | 1 + .../org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../assignment/MergeTableRegionsProcedure.java | 24 ++- .../master/assignment/MoveRegionProcedure.java | 11 +++ .../assignment/SplitTableRegionProcedure.java | 3 ++ .../AbstractStateMachineTableProcedure.java | 31 .../hbase/namespace/TestNamespaceAuditor.java | 8 - .../TestRegionMergeTransactionOnCluster.java| 8 ++--- .../hbase/regionserver/TestRegionMove.java | 14 + .../TestSplitTransactionOnCluster.java | 12 ++-- 12 files changed, 104 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/13f3ba3c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java index 06a0b3d..61ad5cd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java @@ -37,4 +37,7 @@ public class DoNotRetryRegionException extends DoNotRetryIOException { super(s); } + public DoNotRetryRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/13f3ba3c/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java index e690084..5399f07 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java @@ -42,4 +42,8 @@ public class MergeRegionException extends DoNotRetryRegionException { public MergeRegionException(String s) { super(s); } + + public MergeRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/13f3ba3c/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 1134bd6..9666c25 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++
hbase git commit: HBASE-20202 [AMv2] Don't move region if its a split parent or offlined
Repository: hbase Updated Branches: refs/heads/branch-2 e0bdc87b2 -> 79d47dd57 HBASE-20202 [AMv2] Don't move region if its a split parent or offlined M hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java M hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java Allow passing cause to Constructor. M hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto Add prepare step to move procedure. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java Add check that regions to merge are actually online to the Constructor so we can fail fast if they are offline M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java Add prepare step. Check regions and context and skip move if not right. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java Add check parent region is online to constructor. M hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java Add generic check region is online utility function for use by subclasses. M hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMove.java Add test that we fail if we try to move an offlined region. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/79d47dd5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/79d47dd5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/79d47dd5 Branch: refs/heads/branch-2 Commit: 79d47dd57a9b3fbcbab203d3da797140427f45a5 Parents: e0bdc87 Author: Michael StackAuthored: Thu Mar 15 13:33:27 2018 -0700 Committer: Michael Stack Committed: Fri Mar 16 09:34:15 2018 -0700 -- .../hbase/client/DoNotRetryRegionException.java | 3 ++ .../hbase/exceptions/MergeRegionException.java | 4 +++ .../src/main/protobuf/MasterProcedure.proto | 1 + .../org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../assignment/MergeTableRegionsProcedure.java | 24 ++- .../master/assignment/MoveRegionProcedure.java | 11 +++ .../assignment/SplitTableRegionProcedure.java | 3 ++ .../AbstractStateMachineTableProcedure.java | 31 .../hbase/namespace/TestNamespaceAuditor.java | 8 - .../TestRegionMergeTransactionOnCluster.java| 8 ++--- .../hbase/regionserver/TestRegionMove.java | 14 + .../TestSplitTransactionOnCluster.java | 12 ++-- 12 files changed, 104 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/79d47dd5/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java index 06a0b3d..61ad5cd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/DoNotRetryRegionException.java @@ -37,4 +37,7 @@ public class DoNotRetryRegionException extends DoNotRetryIOException { super(s); } + public DoNotRetryRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/79d47dd5/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java index e690084..5399f07 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/MergeRegionException.java @@ -42,4 +42,8 @@ public class MergeRegionException extends DoNotRetryRegionException { public MergeRegionException(String s) { super(s); } + + public MergeRegionException(Throwable cause) { +super(cause); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/79d47dd5/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 1134bd6..9666c25 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++