HBASE-16507 Procedure v2 - Force DDL operation to always roll forward (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9c58d26d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9c58d26d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9c58d26d Branch: refs/heads/hbase-14439 Commit: 9c58d26d3bd5bd4e10be1084a24a62ed25722689 Parents: 4faa8ea Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Sun Sep 18 19:37:46 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Sun Sep 18 19:37:46 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9c58d26d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java index 7eb6465..10467fe 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java @@ -105,8 +105,9 @@ public abstract class StateMachineProcedure<TEnvironment, TState> protected void setNextState(final TState state) { if (aborted.get() && isRollbackSupported(getCurrentState())) { setAbortFailure(getClass().getSimpleName(), "abort requested"); + } else { + setNextState(getStateId(state)); } - setNextState(getStateId(state)); } /**
