hbase git commit: HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign
Repository: hbase Updated Branches: refs/heads/branch-2.1 e26ca63f8 -> d954031d5 HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d954031d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d954031d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d954031d Branch: refs/heads/branch-2.1 Commit: d954031d50c6234d0942cf0f05879aebe42b3345 Parents: e26ca63 Author: Michael Stack Authored: Tue Aug 21 21:06:14 2018 -0700 Committer: Michael Stack Committed: Fri Aug 24 13:22:16 2018 -0700 -- .../hadoop/hbase/procedure2/Procedure.java | 5 +- .../hbase/procedure2/ProcedureExecutor.java | 3 +- .../master/assignment/MoveRegionProcedure.java | 20 ++- .../master/assignment/UnassignProcedure.java| 23 ++- .../hbase/regionserver/HRegionServer.java | 1 - .../master/assignment/TestRegionMove2.java | 174 +++ 6 files changed, 214 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d954031d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java index 83a91fd..2d30388 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java @@ -421,7 +421,10 @@ public abstract class Procedure implements Comparablehttp://git-wip-us.apache.org/repos/asf/hbase/blob/d954031d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index 695c7b0..f773bf9 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1725,7 +1725,8 @@ public class ProcedureExecutor { // children have completed, move parent to front of the queue. store.update(parent); scheduler.addFront(parent); - LOG.info("Finished subprocedure(s) of " + parent + "; resume parent processing."); + LOG.info("Finished subprocedure pid={}, resume processing parent {}", + procedure.getProcId(), parent); return; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/d954031d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java index 6135ce1..968f5f1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java @@ -24,17 +24,19 @@ import java.io.IOException; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.DoNotRetryRegionException; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.procedure.AbstractStateMachineRegionProcedure; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionState; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionStateData; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.yetus.audience.InterfaceAudience; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Procedure that implements a RegionPlan. @@ -55,6 +57,11 @@ public class MoveRegionProcedure extends AbstractStateMachineRegionProcedurehttp://git-wip-us.apache.org/repos/asf/hbase/blob/d954031d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assi
hbase git commit: HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign
Repository: hbase Updated Branches: refs/heads/branch-2 6047fb05f -> a83073aff HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a83073af Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a83073af Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a83073af Branch: refs/heads/branch-2 Commit: a83073aff0f2d4c02da051330a97444211cdc575 Parents: 6047fb0 Author: Michael Stack Authored: Tue Aug 21 21:06:14 2018 -0700 Committer: Michael Stack Committed: Fri Aug 24 13:22:45 2018 -0700 -- .../hadoop/hbase/procedure2/Procedure.java | 5 +- .../hbase/procedure2/ProcedureExecutor.java | 3 +- .../master/assignment/MoveRegionProcedure.java | 20 ++- .../master/assignment/UnassignProcedure.java| 23 ++- .../hbase/regionserver/HRegionServer.java | 1 - .../master/assignment/TestRegionMove2.java | 174 +++ 6 files changed, 214 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a83073af/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java index 58757bb..896cc40 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java @@ -421,7 +421,10 @@ public abstract class Procedure implements Comparablehttp://git-wip-us.apache.org/repos/asf/hbase/blob/a83073af/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index 464eaeb..27bdb9e 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1668,7 +1668,8 @@ public class ProcedureExecutor { // children have completed, move parent to front of the queue. store.update(parent); scheduler.addFront(parent); - LOG.info("Finished subprocedure(s) of " + parent + "; resume parent processing."); + LOG.info("Finished subprocedure pid={}, resume processing parent {}", + procedure.getProcId(), parent); return; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/a83073af/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java index 6135ce1..968f5f1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java @@ -24,17 +24,19 @@ import java.io.IOException; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.DoNotRetryRegionException; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.procedure.AbstractStateMachineRegionProcedure; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionState; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionStateData; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.yetus.audience.InterfaceAudience; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Procedure that implements a RegionPlan. @@ -55,6 +57,11 @@ public class MoveRegionProcedure extends AbstractStateMachineRegionProcedurehttp://git-wip-us.apache.org/repos/asf/hbase/blob/a83073af/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignme
hbase git commit: HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign
Repository: hbase Updated Branches: refs/heads/branch-2.0 5c130fc75 -> 2e885195a HBASE-21078 [amv2] CODE-BUG NPE in RTP doing Unassign Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2e885195 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2e885195 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2e885195 Branch: refs/heads/branch-2.0 Commit: 2e885195a251a4a45f7f691571b978552f7effd5 Parents: 5c130fc Author: Michael Stack Authored: Tue Aug 21 21:06:14 2018 -0700 Committer: Michael Stack Committed: Fri Aug 24 13:21:47 2018 -0700 -- .../hadoop/hbase/procedure2/Procedure.java | 5 +- .../hbase/procedure2/ProcedureExecutor.java | 3 +- .../master/assignment/MoveRegionProcedure.java | 20 ++- .../master/assignment/UnassignProcedure.java| 23 ++- .../hbase/regionserver/HRegionServer.java | 1 - .../master/assignment/TestRegionMove2.java | 174 +++ 6 files changed, 214 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/2e885195/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java index 83a91fd..2d30388 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java @@ -421,7 +421,10 @@ public abstract class Procedure implements Comparablehttp://git-wip-us.apache.org/repos/asf/hbase/blob/2e885195/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index 1e0ee79..aa6e757 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1725,7 +1725,8 @@ public class ProcedureExecutor { // children have completed, move parent to front of the queue. store.update(parent); scheduler.addFront(parent); - LOG.info("Finished subprocedure(s) of " + parent + "; resume parent processing."); + LOG.info("Finished subprocedure pid={}, resume processing parent {}", + procedure.getProcId(), parent); return; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/2e885195/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java index 6135ce1..968f5f1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java @@ -24,17 +24,19 @@ import java.io.IOException; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.DoNotRetryRegionException; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.procedure.AbstractStateMachineRegionProcedure; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionState; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MoveRegionStateData; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.yetus.audience.InterfaceAudience; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Procedure that implements a RegionPlan. @@ -55,6 +57,11 @@ public class MoveRegionProcedure extends AbstractStateMachineRegionProcedurehttp://git-wip-us.apache.org/repos/asf/hbase/blob/2e885195/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assi