Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-16485 Procedure v2 - Add support to addChildProcedure() as last "step" in StateMachineProcedure

This commit is contained in:
Matteo Bertozzi 2016-08-23 16:42:57 -07:00
parent a1e57d942e
commit 1e15fa57df
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
View File

@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.procedure2;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import java.io.IOException;
@ -1288,6 +1289,11 @@ public class ProcedureExecutor<TEnvironment> {
return procId;
}
@VisibleForTesting
protected long getLastProcId() {
return lastProcId.get();
}
private Long getRootProcedureId(Procedure proc) {
return Procedure.getRootProcedureId(procedures, proc);
}

25
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.java
View File

@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachinePr
@InterfaceStability.Evolving
public abstract class StateMachineProcedure<TEnvironment, TState>
extends Procedure<TEnvironment> {
private Flow stateFlow = Flow.HAS_MORE_STATE;
private int stateCount = 0;
private int[] states = null;
@ -114,11 +115,13 @@ public abstract class StateMachineProcedure<TEnvironment, TState>
* Add a child procedure to execute
* @param subProcedure the child procedure
*/
protected void addChildProcedure(Procedure subProcedure) {
protected void addChildProcedure(Procedure... subProcedure) {
if (subProcList == null) {
subProcList = new ArrayList<Procedure>();
subProcList = new ArrayList<Procedure>(subProcedure.length);
}
for (int i = 0; i < subProcedure.length; ++i) {
subProcList.add(subProcedure[i]);
}
subProcList.add(subProcedure);
}
@Override
@ -126,14 +129,14 @@ public abstract class StateMachineProcedure<TEnvironment, TState>
throws ProcedureYieldException, InterruptedException {
updateTimestamp();
try {
if (!hasMoreState()) return null;
TState state = getCurrentState();
if (stateCount == 0) {
setNextState(getStateId(state));
}
if (executeFromState(env, state) == Flow.NO_MORE_STATE) {
// completed
return null;
}
stateFlow = executeFromState(env, state);
if (subProcList != null && subProcList.size() != 0) {
Procedure[] subProcedures = subProcList.toArray(new Procedure[subProcList.size()]);
@ -141,7 +144,7 @@ public abstract class StateMachineProcedure<TEnvironment, TState>
return subProcedures;
}
return (isWaiting() || isFailed()) ? null : new Procedure[] {this};
return (isWaiting() || isFailed() || !hasMoreState()) ? null : new Procedure[] {this};
} finally {
updateTimestamp();
}
@ -164,6 +167,10 @@ public abstract class StateMachineProcedure<TEnvironment, TState>
return isYieldBeforeExecuteFromState(env, getCurrentState());
}
private boolean hasMoreState() {
return stateFlow != Flow.NO_MORE_STATE;
}
private TState getCurrentState() {
return stateCount > 0 ? getState(states[stateCount-1]) : getInitialState();
}
@ -214,4 +221,4 @@ public abstract class StateMachineProcedure<TEnvironment, TState>
states = null;
}
}
}
}

14
hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.java
View File

@ -355,8 +355,7 @@ public class TestProcedureRecovery {
case STATE_2:
LOG.info("execute step 2 " + this);
if (submitChildProc) {
addChildProcedure(new TestStateMachineProcedure());
addChildProcedure(new TestStateMachineProcedure());
addChildProcedure(new TestStateMachineProcedure(), new TestStateMachineProcedure());
setNextState(State.DONE);
} else {
setNextState(State.STATE_3);
@ -375,6 +374,10 @@ public class TestProcedureRecovery {
iResult += 7;
break;
case DONE:
if (submitChildProc) {
addChildProcedure(new TestStateMachineProcedure());
}
iResult += 11;
setResult(Bytes.toBytes(iResult));
return Flow.NO_MORE_STATE;
default:
@ -441,7 +444,10 @@ public class TestProcedureRecovery {
long procId = procExecutor.submitProcedure(new TestStateMachineProcedure(true));
// Wait the completion
ProcedureTestingUtility.waitProcedure(procExecutor, procId);
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);
ProcedureInfo result = procExecutor.getResult(procId);
ProcedureTestingUtility.assertProcNotFailed(result);
assertEquals(19, Bytes.toInt(result.getResult()));
assertEquals(4, procExecutor.getLastProcId());
}
@Test(timeout=30000)
@ -479,7 +485,7 @@ public class TestProcedureRecovery {
// The procedure is completed
ProcedureInfo result = procExecutor.getResult(procId);
ProcedureTestingUtility.assertProcNotFailed(result);
assertEquals(15, Bytes.toInt(result.getResult()));
assertEquals(26, Bytes.toInt(result.getResult()));
}
@Test(timeout=30000)