You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/01/25 18:04:00 UTC
[16/51] [partial] hbase-site git commit: Published site at
a87d9560fcf4803bdd7a01b6e4ec21435d4e11b9.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d6f420/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.Testing.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.Testing.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.Testing.html
index 2ab8ebc..10be916 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.Testing.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.Testing.html
@@ -316,7 +316,7 @@
<span class="sourceLineNo">308</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.308"></a>
<span class="sourceLineNo">309</span> int corruptedCount = 0;<a name="line.309"></a>
<span class="sourceLineNo">310</span> while (procIter.hasNext()) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> Procedure proc = procIter.next();<a name="line.311"></a>
+<span class="sourceLineNo">311</span> ProcedureInfo proc = procIter.nextAsProcedureInfo();<a name="line.311"></a>
<span class="sourceLineNo">312</span> LOG.error("corrupted procedure: " + proc);<a name="line.312"></a>
<span class="sourceLineNo">313</span> corruptedCount++;<a name="line.313"></a>
<span class="sourceLineNo">314</span> }<a name="line.314"></a>
@@ -329,972 +329,989 @@
<span class="sourceLineNo">321</span><a name="line.321"></a>
<span class="sourceLineNo">322</span> private void loadProcedures(final ProcedureIterator procIter,<a name="line.322"></a>
<span class="sourceLineNo">323</span> final boolean abortOnCorruption) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> // 1. Build the rollback stack<a name="line.324"></a>
-<span class="sourceLineNo">325</span> int runnablesCount = 0;<a name="line.325"></a>
-<span class="sourceLineNo">326</span> while (procIter.hasNext()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> Procedure proc = procIter.next();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (!proc.hasParent() && !proc.isFinished()) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> rollbackStack.put(proc.getProcId(), new RootProcedureState());<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span> // add the procedure to the map<a name="line.331"></a>
-<span class="sourceLineNo">332</span> proc.beforeReplay(getEnvironment());<a name="line.332"></a>
-<span class="sourceLineNo">333</span> procedures.put(proc.getProcId(), proc);<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> // add the nonce to the map<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (proc.getNonceKey() != null) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> nonceKeysToProcIdsMap.put(proc.getNonceKey(), proc.getProcId());<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (proc.getState() == ProcedureState.RUNNABLE) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> runnablesCount++;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">324</span> final boolean isDebugEnabled = LOG.isDebugEnabled();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> // 1. Build the rollback stack<a name="line.326"></a>
+<span class="sourceLineNo">327</span> int runnablesCount = 0;<a name="line.327"></a>
+<span class="sourceLineNo">328</span> while (procIter.hasNext()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> final NonceKey nonceKey;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> final long procId;<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (procIter.isNextCompleted()) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> ProcedureInfo proc = procIter.nextAsProcedureInfo();<a name="line.333"></a>
+<span class="sourceLineNo">334</span> nonceKey = proc.getNonceKey();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> procId = proc.getProcId();<a name="line.335"></a>
+<span class="sourceLineNo">336</span> completed.put(proc.getProcId(), proc);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> if (isDebugEnabled) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.debug("The procedure is completed: " + proc);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } else {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> Procedure proc = procIter.nextAsProcedure();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> nonceKey = proc.getNonceKey();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> procId = proc.getProcId();<a name="line.343"></a>
<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> // 2. Initialize the stacks<a name="line.345"></a>
-<span class="sourceLineNo">346</span> ArrayList<Procedure> runnableList = new ArrayList(runnablesCount);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> HashSet<Procedure> waitingSet = null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> procIter.reset();<a name="line.348"></a>
-<span class="sourceLineNo">349</span> while (procIter.hasNext()) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> Procedure proc = procIter.next();<a name="line.350"></a>
-<span class="sourceLineNo">351</span> if (LOG.isDebugEnabled()) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span> LOG.debug(String.format("Loading procedure state=%s isFailed=%s: %s",<a name="line.352"></a>
-<span class="sourceLineNo">353</span> proc.getState(), proc.hasException(), proc));<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> Long rootProcId = getRootProcedureId(proc);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (rootProcId == null) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> // The 'proc' was ready to run but the root procedure was rolledback?<a name="line.358"></a>
-<span class="sourceLineNo">359</span> runnables.addBack(proc);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> continue;<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> if (!proc.hasParent() && proc.isFinished()) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (LOG.isDebugEnabled()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> LOG.debug(String.format("The procedure is completed state=%s isFailed=%s",<a name="line.365"></a>
-<span class="sourceLineNo">366</span> proc.getState(), proc.hasException()));<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span> assert !rollbackStack.containsKey(proc.getProcId());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> procedures.remove(proc.getProcId());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> completed.put(proc.getProcId(), Procedure.createProcedureInfo(proc, proc.getNonceKey()));<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">345</span> if (!proc.hasParent()) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> assert !proc.isFinished() : "unexpected finished procedure";<a name="line.346"></a>
+<span class="sourceLineNo">347</span> rollbackStack.put(proc.getProcId(), new RootProcedureState());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> // add the procedure to the map<a name="line.350"></a>
+<span class="sourceLineNo">351</span> proc.beforeReplay(getEnvironment());<a name="line.351"></a>
+<span class="sourceLineNo">352</span> procedures.put(proc.getProcId(), proc);<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (proc.getState() == ProcedureState.RUNNABLE) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> runnablesCount++;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> // add the nonce to the map<a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (nonceKey != null) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> nonceKeysToProcIdsMap.put(nonceKey, procId);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> // 2. Initialize the stacks<a name="line.365"></a>
+<span class="sourceLineNo">366</span> ArrayList<Procedure> runnableList = new ArrayList(runnablesCount);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> HashSet<Procedure> waitingSet = null;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> procIter.reset();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> while (procIter.hasNext()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> if (procIter.isNextCompleted()) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> procIter.skipNext();<a name="line.371"></a>
<span class="sourceLineNo">372</span> continue;<a name="line.372"></a>
<span class="sourceLineNo">373</span> }<a name="line.373"></a>
<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (proc.hasParent() && !proc.isFinished()) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> Procedure parent = procedures.get(proc.getParentProcId());<a name="line.376"></a>
-<span class="sourceLineNo">377</span> // corrupted procedures are handled later at step 3<a name="line.377"></a>
-<span class="sourceLineNo">378</span> if (parent != null) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> parent.incChildrenLatch();<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">375</span> Procedure proc = procIter.nextAsProcedure();<a name="line.375"></a>
+<span class="sourceLineNo">376</span> assert !(proc.isFinished() && !proc.hasParent()) : "unexpected completed proc=" + proc;<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> if (isDebugEnabled) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> LOG.debug(String.format("Loading procedure state=%s isFailed=%s: %s",<a name="line.379"></a>
+<span class="sourceLineNo">380</span> proc.getState(), proc.hasException(), proc));<a name="line.380"></a>
<span class="sourceLineNo">381</span> }<a name="line.381"></a>
<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> RootProcedureState procStack = rollbackStack.get(rootProcId);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> procStack.loadStack(proc);<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> switch (proc.getState()) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> case RUNNABLE:<a name="line.387"></a>
-<span class="sourceLineNo">388</span> runnableList.add(proc);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> break;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> case WAITING_TIMEOUT:<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (waitingSet == null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> waitingSet = new HashSet<Procedure>();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> waitingSet.add(proc);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> break;<a name="line.395"></a>
-<span class="sourceLineNo">396</span> case FINISHED:<a name="line.396"></a>
-<span class="sourceLineNo">397</span> if (proc.hasException()) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> // add the proc to the runnables to perform the rollback<a name="line.398"></a>
-<span class="sourceLineNo">399</span> runnables.addBack(proc);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> break;<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span> case ROLLEDBACK:<a name="line.402"></a>
-<span class="sourceLineNo">403</span> case INITIALIZING:<a name="line.403"></a>
-<span class="sourceLineNo">404</span> String msg = "Unexpected " + proc.getState() + " state for " + proc;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> LOG.error(msg);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> throw new UnsupportedOperationException(msg);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> default:<a name="line.407"></a>
-<span class="sourceLineNo">408</span> break;<a name="line.408"></a>
-<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // 3. Validate the stacks<a name="line.412"></a>
-<span class="sourceLineNo">413</span> int corruptedCount = 0;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Iterator<Map.Entry<Long, RootProcedureState>> itStack = rollbackStack.entrySet().iterator();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> while (itStack.hasNext()) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> Map.Entry<Long, RootProcedureState> entry = itStack.next();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> RootProcedureState procStack = entry.getValue();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (procStack.isValid()) continue;<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> for (Procedure proc: procStack.getSubprocedures()) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span> LOG.error("corrupted procedure: " + proc);<a name="line.421"></a>
-<span class="sourceLineNo">422</span> procedures.remove(proc.getProcId());<a name="line.422"></a>
-<span class="sourceLineNo">423</span> runnableList.remove(proc);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (waitingSet != null) waitingSet.remove(proc);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> corruptedCount++;<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> itStack.remove();<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (abortOnCorruption && corruptedCount > 0) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> throw new IOException("found " + corruptedCount + " procedures on replay");<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> // 4. Push the runnables<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (!runnableList.isEmpty()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> // TODO: See ProcedureWALFormatReader#hasFastStartSupport<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // some procedure may be started way before this stuff.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> for (int i = runnableList.size() - 1; i >= 0; --i) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> Procedure proc = runnableList.get(i);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (!proc.hasParent()) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> sendProcedureLoadedNotification(proc.getProcId());<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (proc.wasExecuted()) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> runnables.addFront(proc);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> } else {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> // if it was not in execution, it can wait.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> runnables.addBack(proc);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Start the procedure executor.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * It calls ProcedureStore.recoverLease() and ProcedureStore.load() to<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * recover the lease, and ensure a single executor, and start the procedure<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * replay to resume and recover the previous pending and in-progress perocedures.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> *<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @param numThreads number of threads available for procedure execution.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @param abortOnCorruption true if you want to abort your service in case<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * a corrupted procedure is found on replay. otherwise false.<a name="line.461"></a>
-<span class="sourceLineNo">462</span> */<a name="line.462"></a>
-<span class="sourceLineNo">463</span> public void start(int numThreads, boolean abortOnCorruption) throws IOException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> if (running.getAndSet(true)) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> LOG.warn("Already running");<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> // We have numThreads executor + one timer thread used for timing out<a name="line.469"></a>
-<span class="sourceLineNo">470</span> // procedures and triggering periodic procedures.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> threads = new Thread[numThreads + 1];<a name="line.471"></a>
-<span class="sourceLineNo">472</span> LOG.info("Starting procedure executor threads=" + threads.length);<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span> // Initialize procedures executor<a name="line.474"></a>
-<span class="sourceLineNo">475</span> for (int i = 0; i < numThreads; ++i) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> threads[i] = new Thread("ProcedureExecutor-" + i) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> @Override<a name="line.477"></a>
-<span class="sourceLineNo">478</span> public void run() {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> execLoop();<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> };<a name="line.481"></a>
+<span class="sourceLineNo">383</span> Long rootProcId = getRootProcedureId(proc);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> if (rootProcId == null) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> // The 'proc' was ready to run but the root procedure was rolledback?<a name="line.385"></a>
+<span class="sourceLineNo">386</span> runnables.addBack(proc);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> continue;<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> if (proc.hasParent() && !proc.isFinished()) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> Procedure parent = procedures.get(proc.getParentProcId());<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // corrupted procedures are handled later at step 3<a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (parent != null) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> parent.incChildrenLatch();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> RootProcedureState procStack = rollbackStack.get(rootProcId);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> procStack.loadStack(proc);<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> switch (proc.getState()) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> case RUNNABLE:<a name="line.402"></a>
+<span class="sourceLineNo">403</span> runnableList.add(proc);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> break;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> case WAITING_TIMEOUT:<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (waitingSet == null) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> waitingSet = new HashSet<Procedure>();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> waitingSet.add(proc);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> break;<a name="line.410"></a>
+<span class="sourceLineNo">411</span> case FINISHED:<a name="line.411"></a>
+<span class="sourceLineNo">412</span> if (proc.hasException()) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // add the proc to the runnables to perform the rollback<a name="line.413"></a>
+<span class="sourceLineNo">414</span> runnables.addBack(proc);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> break;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> case ROLLEDBACK:<a name="line.417"></a>
+<span class="sourceLineNo">418</span> case INITIALIZING:<a name="line.418"></a>
+<span class="sourceLineNo">419</span> String msg = "Unexpected " + proc.getState() + " state for " + proc;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.error(msg);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> throw new UnsupportedOperationException(msg);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> default:<a name="line.422"></a>
+<span class="sourceLineNo">423</span> break;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> // 3. Validate the stacks<a name="line.427"></a>
+<span class="sourceLineNo">428</span> int corruptedCount = 0;<a name="line.428"></a>
+<span class="sourceLineNo">429</span> Iterator<Map.Entry<Long, RootProcedureState>> itStack = rollbackStack.entrySet().iterator();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> while (itStack.hasNext()) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> Map.Entry<Long, RootProcedureState> entry = itStack.next();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> RootProcedureState procStack = entry.getValue();<a name="line.432"></a>
+<span class="sourceLineNo">433</span> if (procStack.isValid()) continue;<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span> for (Procedure proc: procStack.getSubprocedures()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> LOG.error("corrupted procedure: " + proc);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> procedures.remove(proc.getProcId());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> runnableList.remove(proc);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> if (waitingSet != null) waitingSet.remove(proc);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> corruptedCount++;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> itStack.remove();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> if (abortOnCorruption && corruptedCount > 0) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> throw new IOException("found " + corruptedCount + " procedures on replay");<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> // 4. Push the runnables<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (!runnableList.isEmpty()) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // TODO: See ProcedureWALFormatReader#hasFastStartSupport<a name="line.451"></a>
+<span class="sourceLineNo">452</span> // some procedure may be started way before this stuff.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> for (int i = runnableList.size() - 1; i >= 0; --i) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> Procedure proc = runnableList.get(i);<a name="line.454"></a>
+<span class="sourceLineNo">455</span> if (!proc.hasParent()) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> sendProcedureLoadedNotification(proc.getProcId());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> if (proc.wasExecuted()) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> runnables.addFront(proc);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> } else {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> // if it was not in execution, it can wait.<a name="line.461"></a>
+<span class="sourceLineNo">462</span> runnables.addBack(proc);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> }<a name="line.463"></a>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> /**<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * Start the procedure executor.<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * It calls ProcedureStore.recoverLease() and ProcedureStore.load() to<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * recover the lease, and ensure a single executor, and start the procedure<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * replay to resume and recover the previous pending and in-progress perocedures.<a name="line.472"></a>
+<span class="sourceLineNo">473</span> *<a name="line.473"></a>
+<span class="sourceLineNo">474</span> * @param numThreads number of threads available for procedure execution.<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @param abortOnCorruption true if you want to abort your service in case<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * a corrupted procedure is found on replay. otherwise false.<a name="line.476"></a>
+<span class="sourceLineNo">477</span> */<a name="line.477"></a>
+<span class="sourceLineNo">478</span> public void start(int numThreads, boolean abortOnCorruption) throws IOException {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> if (running.getAndSet(true)) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> LOG.warn("Already running");<a name="line.480"></a>
+<span class="sourceLineNo">481</span> return;<a name="line.481"></a>
<span class="sourceLineNo">482</span> }<a name="line.482"></a>
<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> // Initialize procedures timeout handler (this is the +1 thread)<a name="line.484"></a>
-<span class="sourceLineNo">485</span> threads[numThreads] = new Thread("ProcedureExecutorTimeoutThread") {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> @Override<a name="line.486"></a>
-<span class="sourceLineNo">487</span> public void run() {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> timeoutLoop();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span> };<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Acquire the store lease.<a name="line.492"></a>
-<span class="sourceLineNo">493</span> store.recoverLease();<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> // TODO: Split in two steps.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> // TODO: Handle corrupted procedures (currently just a warn)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> // The first one will make sure that we have the latest id,<a name="line.497"></a>
-<span class="sourceLineNo">498</span> // so we can start the threads and accept new procedures.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> // The second step will do the actual load of old procedures.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> load(abortOnCorruption);<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span> // Start the executors. Here we must have the lastProcId set.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> for (int i = 0; i < threads.length; ++i) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span> threads[i].start();<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">484</span> // We have numThreads executor + one timer thread used for timing out<a name="line.484"></a>
+<span class="sourceLineNo">485</span> // procedures and triggering periodic procedures.<a name="line.485"></a>
+<span class="sourceLineNo">486</span> threads = new Thread[numThreads + 1];<a name="line.486"></a>
+<span class="sourceLineNo">487</span> LOG.info("Starting procedure executor threads=" + threads.length);<a name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span> // Initialize procedures executor<a name="line.489"></a>
+<span class="sourceLineNo">490</span> for (int i = 0; i < numThreads; ++i) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> threads[i] = new Thread("ProcedureExecutor-" + i) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> @Override<a name="line.492"></a>
+<span class="sourceLineNo">493</span> public void run() {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> execLoop();<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> };<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> // Initialize procedures timeout handler (this is the +1 thread)<a name="line.499"></a>
+<span class="sourceLineNo">500</span> threads[numThreads] = new Thread("ProcedureExecutorTimeoutThread") {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> @Override<a name="line.501"></a>
+<span class="sourceLineNo">502</span> public void run() {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> timeoutLoop();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> };<a name="line.505"></a>
<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> // Add completed cleaner<a name="line.507"></a>
-<span class="sourceLineNo">508</span> waitingTimeout.add(<a name="line.508"></a>
-<span class="sourceLineNo">509</span> new CompletedProcedureCleaner(conf, store, completed, nonceKeysToProcIdsMap));<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> public void stop() {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> if (!running.getAndSet(false)) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">507</span> // Acquire the store lease.<a name="line.507"></a>
+<span class="sourceLineNo">508</span> store.recoverLease();<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span> // TODO: Split in two steps.<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // TODO: Handle corrupted procedures (currently just a warn)<a name="line.511"></a>
+<span class="sourceLineNo">512</span> // The first one will make sure that we have the latest id,<a name="line.512"></a>
+<span class="sourceLineNo">513</span> // so we can start the threads and accept new procedures.<a name="line.513"></a>
+<span class="sourceLineNo">514</span> // The second step will do the actual load of old procedures.<a name="line.514"></a>
+<span class="sourceLineNo">515</span> load(abortOnCorruption);<a name="line.515"></a>
<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> LOG.info("Stopping the procedure executor");<a name="line.517"></a>
-<span class="sourceLineNo">518</span> runnables.signalAll();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> waitingTimeout.signalAll();<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">517</span> // Start the executors. Here we must have the lastProcId set.<a name="line.517"></a>
+<span class="sourceLineNo">518</span> for (int i = 0; i < threads.length; ++i) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> threads[i].start();<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> public void join() {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> boolean interrupted = false;<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> for (int i = 0; i < threads.length; ++i) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> try {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> threads[i].join();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> } catch (InterruptedException ex) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> interrupted = true;<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> if (interrupted) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> Thread.currentThread().interrupt();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
+<span class="sourceLineNo">522</span> // Add completed cleaner<a name="line.522"></a>
+<span class="sourceLineNo">523</span> waitingTimeout.add(<a name="line.523"></a>
+<span class="sourceLineNo">524</span> new CompletedProcedureCleaner(conf, store, completed, nonceKeysToProcIdsMap));<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> public void stop() {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (!running.getAndSet(false)) {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> return;<a name="line.529"></a>
+<span class="sourceLineNo">530</span> }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> LOG.info("Stopping the procedure executor");<a name="line.532"></a>
+<span class="sourceLineNo">533</span> runnables.signalAll();<a name="line.533"></a>
+<span class="sourceLineNo">534</span> waitingTimeout.signalAll();<a name="line.534"></a>
+<span class="sourceLineNo">535</span> }<a name="line.535"></a>
<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> completed.clear();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> rollbackStack.clear();<a name="line.538"></a>
-<span class="sourceLineNo">539</span> procedures.clear();<a name="line.539"></a>
-<span class="sourceLineNo">540</span> nonceKeysToProcIdsMap.clear();<a name="line.540"></a>
-<span class="sourceLineNo">541</span> waitingTimeout.clear();<a name="line.541"></a>
-<span class="sourceLineNo">542</span> runnables.clear();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> lastProcId.set(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span> public boolean isRunning() {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> return running.get();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span> /**<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * @return the number of execution threads.<a name="line.551"></a>
-<span class="sourceLineNo">552</span> */<a name="line.552"></a>
-<span class="sourceLineNo">553</span> public int getNumThreads() {<a name="line.553"></a>
-<span class="sourceLineNo">554</span> return threads == null ? 0 : (threads.length - 1);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> public int getActiveExecutorCount() {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> return activeExecutorCount.get();<a name="line.558"></a>
+<span class="sourceLineNo">537</span> public void join() {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> boolean interrupted = false;<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> for (int i = 0; i < threads.length; ++i) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> try {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> threads[i].join();<a name="line.542"></a>
+<span class="sourceLineNo">543</span> } catch (InterruptedException ex) {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> interrupted = true;<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span> }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span> if (interrupted) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> Thread.currentThread().interrupt();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> }<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> completed.clear();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> rollbackStack.clear();<a name="line.553"></a>
+<span class="sourceLineNo">554</span> procedures.clear();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> nonceKeysToProcIdsMap.clear();<a name="line.555"></a>
+<span class="sourceLineNo">556</span> waitingTimeout.clear();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> runnables.clear();<a name="line.557"></a>
+<span class="sourceLineNo">558</span> lastProcId.set(-1);<a name="line.558"></a>
<span class="sourceLineNo">559</span> }<a name="line.559"></a>
<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> public TEnvironment getEnvironment() {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> return this.environment;<a name="line.562"></a>
+<span class="sourceLineNo">561</span> public boolean isRunning() {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> return running.get();<a name="line.562"></a>
<span class="sourceLineNo">563</span> }<a name="line.563"></a>
<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span> public ProcedureStore getStore() {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> return this.store;<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span> public void registerListener(ProcedureExecutorListener listener) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> this.listeners.add(listener);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> public boolean unregisterListener(ProcedureExecutorListener listener) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return this.listeners.remove(listener);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * List procedures.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return the procedures in a list<a name="line.579"></a>
-<span class="sourceLineNo">580</span> */<a name="line.580"></a>
-<span class="sourceLineNo">581</span> public List<ProcedureInfo> listProcedures() {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> List<ProcedureInfo> procedureLists =<a name="line.582"></a>
-<span class="sourceLineNo">583</span> new ArrayList<ProcedureInfo>(procedures.size() + completed.size());<a name="line.583"></a>
-<span class="sourceLineNo">584</span> for (java.util.Map.Entry<Long, Procedure> p: procedures.entrySet()) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> procedureLists.add(Procedure.createProcedureInfo(p.getValue(), null));<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span> for (java.util.Map.Entry<Long, ProcedureInfo> e: completed.entrySet()) {<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // Note: The procedure could show up twice in the list with different state, as<a name="line.588"></a>
-<span class="sourceLineNo">589</span> // it could complete after we walk through procedures list and insert into<a name="line.589"></a>
-<span class="sourceLineNo">590</span> // procedureList - it is ok, as we will use the information in the ProcedureInfo<a name="line.590"></a>
-<span class="sourceLineNo">591</span> // to figure it out; to prevent this would increase the complexity of the logic.<a name="line.591"></a>
-<span class="sourceLineNo">592</span> procedureLists.add(e.getValue());<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> return procedureLists;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> /**<a name="line.597"></a>
-<span class="sourceLineNo">598</span> * Add a new root-procedure to the executor.<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * @param proc the new procedure to execute.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * @return the procedure id, that can be used to monitor the operation<a name="line.600"></a>
-<span class="sourceLineNo">601</span> */<a name="line.601"></a>
-<span class="sourceLineNo">602</span> public long submitProcedure(final Procedure proc) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> return submitProcedure(proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span> /**<a name="line.606"></a>
-<span class="sourceLineNo">607</span> * Add a new root-procedure to the executor.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> * @param proc the new procedure to execute.<a name="line.608"></a>
-<span class="sourceLineNo">609</span> * @param nonceGroup<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * @param nonce<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * @return the procedure id, that can be used to monitor the operation<a name="line.611"></a>
-<span class="sourceLineNo">612</span> */<a name="line.612"></a>
-<span class="sourceLineNo">613</span> public long submitProcedure(<a name="line.613"></a>
-<span class="sourceLineNo">614</span> final Procedure proc,<a name="line.614"></a>
-<span class="sourceLineNo">615</span> final long nonceGroup,<a name="line.615"></a>
-<span class="sourceLineNo">616</span> final long nonce) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> Preconditions.checkArgument(proc.getState() == ProcedureState.INITIALIZING);<a name="line.617"></a>
-<span class="sourceLineNo">618</span> Preconditions.checkArgument(isRunning());<a name="line.618"></a>
-<span class="sourceLineNo">619</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.619"></a>
-<span class="sourceLineNo">620</span> Preconditions.checkArgument(!proc.hasParent());<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span> Long currentProcId;<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> // The following part of the code has to be synchronized to prevent multiple request<a name="line.624"></a>
-<span class="sourceLineNo">625</span> // with the same nonce to execute at the same time.<a name="line.625"></a>
-<span class="sourceLineNo">626</span> synchronized (this) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> // Check whether the proc exists. If exist, just return the proc id.<a name="line.627"></a>
-<span class="sourceLineNo">628</span> // This is to prevent the same proc to submit multiple times (it could happen<a name="line.628"></a>
-<span class="sourceLineNo">629</span> // when client could not talk to server and resubmit the same request).<a name="line.629"></a>
-<span class="sourceLineNo">630</span> NonceKey noncekey = null;<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (nonce != HConstants.NO_NONCE) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> noncekey = new NonceKey(nonceGroup, nonce);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> currentProcId = nonceKeysToProcIdsMap.get(noncekey);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> if (currentProcId != null) {<a name="line.634"></a>
-<span class="sourceLineNo">635</span> // Found the proc<a name="line.635"></a>
-<span class="sourceLineNo">636</span> return currentProcId;<a name="line.636"></a>
-<span class="sourceLineNo">637</span> }<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span><a name="line.639"></a>
-<span class="sourceLineNo">640</span> // Initialize the Procedure ID<a name="line.640"></a>
-<span class="sourceLineNo">641</span> currentProcId = nextProcId();<a name="line.641"></a>
-<span class="sourceLineNo">642</span> proc.setProcId(currentProcId);<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> // This is new procedure. Set the noncekey and insert into the map.<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if (noncekey != null) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> proc.setNonceKey(noncekey);<a name="line.646"></a>
-<span class="sourceLineNo">647</span> nonceKeysToProcIdsMap.put(noncekey, currentProcId);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> } // end of synchronized (this)<a name="line.649"></a>
-<span class="sourceLineNo">650</span><a name="line.650"></a>
-<span class="sourceLineNo">651</span> // Commit the transaction<a name="line.651"></a>
-<span class="sourceLineNo">652</span> store.insert(proc, null);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (LOG.isDebugEnabled()) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span> LOG.debug("Procedure " + proc + " added to the store.");<a name="line.654"></a>
-<span class="sourceLineNo">655</span> }<a name="line.655"></a>
-<span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span> // Create the rollback stack for the procedure<a name="line.657"></a>
-<span class="sourceLineNo">658</span> RootProcedureState stack = new RootProcedureState();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> rollbackStack.put(currentProcId, stack);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Submit the new subprocedures<a name="line.661"></a>
-<span class="sourceLineNo">662</span> assert !procedures.containsKey(currentProcId);<a name="line.662"></a>
-<span class="sourceLineNo">663</span> procedures.put(currentProcId, proc);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> sendProcedureAddedNotification(currentProcId);<a name="line.664"></a>
-<span class="sourceLineNo">665</span> runnables.addBack(proc);<a name="line.665"></a>
-<span class="sourceLineNo">666</span> return currentProcId;<a name="line.666"></a>
-<span class="sourceLineNo">667</span> }<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> public ProcedureInfo getResult(final long procId) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return completed.get(procId);<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span><a name="line.672"></a>
-<span class="sourceLineNo">673</span> /**<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * Return true if the procedure is finished.<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * The state may be "completed successfully" or "failed and rolledback".<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * Use getResult() to check the state or get the result data.<a name="line.676"></a>
-<span class="sourceLineNo">677</span> * @param procId the ID of the procedure to check<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * @return true if the procedure execution is finished, otherwise false.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> */<a name="line.679"></a>
-<span class="sourceLineNo">680</span> public boolean isFinished(final long procId) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> return completed.containsKey(procId);<a name="line.681"></a>
+<span class="sourceLineNo">565</span> /**<a name="line.565"></a>
+<span class="sourceLineNo">566</span> * @return the number of execution threads.<a name="line.566"></a>
+<span class="sourceLineNo">567</span> */<a name="line.567"></a>
+<span class="sourceLineNo">568</span> public int getNumThreads() {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> return threads == null ? 0 : (threads.length - 1);<a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">571</span><a name="line.571"></a>
+<span class="sourceLineNo">572</span> public int getActiveExecutorCount() {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> return activeExecutorCount.get();<a name="line.573"></a>
+<span class="sourceLineNo">574</span> }<a name="line.574"></a>
+<span class="sourceLineNo">575</span><a name="line.575"></a>
+<span class="sourceLineNo">576</span> public TEnvironment getEnvironment() {<a name="line.576"></a>
+<span class="sourceLineNo">577</span> return this.environment;<a name="line.577"></a>
+<span class="sourceLineNo">578</span> }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span> public ProcedureStore getStore() {<a name="line.580"></a>
+<span class="sourceLineNo">581</span> return this.store;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span> public void registerListener(ProcedureExecutorListener listener) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> this.listeners.add(listener);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span><a name="line.587"></a>
+<span class="sourceLineNo">588</span> public boolean unregisterListener(ProcedureExecutorListener listener) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return this.listeners.remove(listener);<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span> /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * List procedures.<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return the procedures in a list<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public List<ProcedureInfo> listProcedures() {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> List<ProcedureInfo> procedureLists =<a name="line.597"></a>
+<span class="sourceLineNo">598</span> new ArrayList<ProcedureInfo>(procedures.size() + completed.size());<a name="line.598"></a>
+<span class="sourceLineNo">599</span> for (java.util.Map.Entry<Long, Procedure> p: procedures.entrySet()) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> procedureLists.add(Procedure.createProcedureInfo(p.getValue(), null));<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> for (java.util.Map.Entry<Long, ProcedureInfo> e: completed.entrySet()) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> // Note: The procedure could show up twice in the list with different state, as<a name="line.603"></a>
+<span class="sourceLineNo">604</span> // it could complete after we walk through procedures list and insert into<a name="line.604"></a>
+<span class="sourceLineNo">605</span> // procedureList - it is ok, as we will use the information in the ProcedureInfo<a name="line.605"></a>
+<span class="sourceLineNo">606</span> // to figure it out; to prevent this would increase the complexity of the logic.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> procedureLists.add(e.getValue());<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> return procedureLists;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span><a name="line.611"></a>
+<span class="sourceLineNo">612</span> /**<a name="line.612"></a>
+<span class="sourceLineNo">613</span> * Add a new root-procedure to the executor.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> * @param proc the new procedure to execute.<a name="line.614"></a>
+<span class="sourceLineNo">615</span> * @return the procedure id, that can be used to monitor the operation<a name="line.615"></a>
+<span class="sourceLineNo">616</span> */<a name="line.616"></a>
+<span class="sourceLineNo">617</span> public long submitProcedure(final Procedure proc) {<a name="line.617"></a>
+<span class="sourceLineNo">618</span> return submitProcedure(proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Add a new root-procedure to the executor.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param proc the new procedure to execute.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param nonceGroup<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @param nonce<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @return the procedure id, that can be used to monitor the operation<a name="line.626"></a>
+<span class="sourceLineNo">627</span> */<a name="line.627"></a>
+<span class="sourceLineNo">628</span> public long submitProcedure(<a name="line.628"></a>
+<span class="sourceLineNo">629</span> final Procedure proc,<a name="line.629"></a>
+<span class="sourceLineNo">630</span> final long nonceGroup,<a name="line.630"></a>
+<span class="sourceLineNo">631</span> final long nonce) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> Preconditions.checkArgument(proc.getState() == ProcedureState.INITIALIZING);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> Preconditions.checkArgument(isRunning());<a name="line.633"></a>
+<span class="sourceLineNo">634</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.634"></a>
+<span class="sourceLineNo">635</span> Preconditions.checkArgument(!proc.hasParent());<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span> Long currentProcId;<a name="line.637"></a>
+<span class="sourceLineNo">638</span><a name="line.638"></a>
+<span class="sourceLineNo">639</span> // The following part of the code has to be synchronized to prevent multiple request<a name="line.639"></a>
+<span class="sourceLineNo">640</span> // with the same nonce to execute at the same time.<a name="line.640"></a>
+<span class="sourceLineNo">641</span> synchronized (this) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> // Check whether the proc exists. If exist, just return the proc id.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> // This is to prevent the same proc to submit multiple times (it could happen<a name="line.643"></a>
+<span class="sourceLineNo">644</span> // when client could not talk to server and resubmit the same request).<a name="line.644"></a>
+<span class="sourceLineNo">645</span> NonceKey noncekey = null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span> if (nonce != HConstants.NO_NONCE) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span> noncekey = new NonceKey(nonceGroup, nonce);<a name="line.647"></a>
+<span class="sourceLineNo">648</span> currentProcId = nonceKeysToProcIdsMap.get(noncekey);<a name="line.648"></a>
+<span class="sourceLineNo">649</span> if (currentProcId != null) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span> // Found the proc<a name="line.650"></a>
+<span class="sourceLineNo">651</span> return currentProcId;<a name="line.651"></a>
+<span class="sourceLineNo">652</span> }<a name="line.652"></a>
+<span class="sourceLineNo">653</span> }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span> // Initialize the Procedure ID<a name="line.655"></a>
+<span class="sourceLineNo">656</span> currentProcId = nextProcId();<a name="line.656"></a>
+<span class="sourceLineNo">657</span> proc.setProcId(currentProcId);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> // This is new procedure. Set the noncekey and insert into the map.<a name="line.659"></a>
+<span class="sourceLineNo">660</span> if (noncekey != null) {<a name="line.660"></a>
+<span class="sourceLineNo">661</span> proc.setNonceKey(noncekey);<a name="line.661"></a>
+<span class="sourceLineNo">662</span> nonceKeysToProcIdsMap.put(noncekey, currentProcId);<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> } // end of synchronized (this)<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span> // Commit the transaction<a name="line.666"></a>
+<span class="sourceLineNo">667</span> store.insert(proc, null);<a name="line.667"></a>
+<span class="sourceLineNo">668</span> if (LOG.isDebugEnabled()) {<a name="line.668"></a>
+<span class="sourceLineNo">669</span> LOG.debug("Procedure " + proc + " added to the store.");<a name="line.669"></a>
+<span class="sourceLineNo">670</span> }<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span> // Create the rollback stack for the procedure<a name="line.672"></a>
+<span class="sourceLineNo">673</span> RootProcedureState stack = new RootProcedureState();<a name="line.673"></a>
+<span class="sourceLineNo">674</span> rollbackStack.put(currentProcId, stack);<a name="line.674"></a>
+<span class="sourceLineNo">675</span><a name="line.675"></a>
+<span class="sourceLineNo">676</span> // Submit the new subprocedures<a name="line.676"></a>
+<span class="sourceLineNo">677</span> assert !procedures.containsKey(currentProcId);<a name="line.677"></a>
+<span class="sourceLineNo">678</span> procedures.put(currentProcId, proc);<a name="line.678"></a>
+<span class="sourceLineNo">679</span> sendProcedureAddedNotification(currentProcId);<a name="line.679"></a>
+<span class="sourceLineNo">680</span> runnables.addBack(proc);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return currentProcId;<a name="line.681"></a>
<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> /**<a name="line.684"></a>
-<span class="sourceLineNo">685</span> * Return true if the procedure is started.<a name="line.685"></a>
-<span class="sourceLineNo">686</span> * @param procId the ID of the procedure to check<a name="line.686"></a>
-<span class="sourceLineNo">687</span> * @return true if the procedure execution is started, otherwise false.<a name="line.687"></a>
-<span class="sourceLineNo">688</span> */<a name="line.688"></a>
-<span class="sourceLineNo">689</span> public boolean isStarted(final long procId) {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> Procedure proc = procedures.get(procId);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> if (proc == null) {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> return completed.get(procId) != null;<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> return proc.wasExecuted();<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * Mark the specified completed procedure, as ready to remove.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> * @param procId the ID of the procedure to remove<a name="line.699"></a>
-<span class="sourceLineNo">700</span> */<a name="line.700"></a>
-<span class="sourceLineNo">701</span> public void removeResult(final long procId) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> ProcedureInfo result = completed.get(procId);<a name="line.702"></a>
-<span class="sourceLineNo">703</span> if (result == null) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span> assert !procedures.containsKey(procId) : "procId=" + procId + " is still running";<a name="line.704"></a>
-<span class="sourceLineNo">705</span> if (LOG.isDebugEnabled()) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> LOG.debug("Procedure procId=" + procId + " already removed by the cleaner.");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // The CompletedProcedureCleaner will take care of deletion, once the TTL is expired.<a name="line.711"></a>
-<span class="sourceLineNo">712</span> result.setClientAckTime(EnvironmentEdgeManager.currentTime());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> }<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span> /**<a name="line.715"></a>
-<span class="sourceLineNo">716</span> * Send an abort notification the specified procedure.<a name="line.716"></a>
-<span class="sourceLineNo">717</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * @param procId the procedure to abort<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> */<a name="line.720"></a>
-<span class="sourceLineNo">721</span> public boolean abort(final long procId) {<a name="line.721"></a>
-<span class="sourceLineNo">722</span> return abort(procId, true);<a name="line.722"></a>
-<span class="sourceLineNo">723</span> }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span> /**<a name="line.725"></a>
-<span class="sourceLineNo">726</span> * Send an abort notification the specified procedure.<a name="line.726"></a>
-<span class="sourceLineNo">727</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.727"></a>
-<span class="sourceLineNo">728</span> * @param procId the procedure to abort<a name="line.728"></a>
-<span class="sourceLineNo">729</span> * @param mayInterruptIfRunning if the proc completed at least one step, should it be aborted?<a name="line.729"></a>
-<span class="sourceLineNo">730</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.730"></a>
-<span class="sourceLineNo">731</span> */<a name="line.731"></a>
-<span class="sourceLineNo">732</span> public boolean abort(final long procId, final boolean mayInterruptIfRunning) {<a name="line.732"></a>
-<span class="sourceLineNo">733</span> Procedure proc = procedures.get(procId);<a name="line.733"></a>
-<span class="sourceLineNo">734</span> if (proc != null) {<a name="line.734"></a>
-<span class="sourceLineNo">735</span> if (!mayInterruptIfRunning && proc.wasExecuted()) {<a name="line.735"></a>
-<span class="sourceLineNo">736</span> return false;<a name="line.736"></a>
-<span class="sourceLineNo">737</span> } else {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> return proc.abort(getEnvironment());<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> }<a name="line.740"></a>
-<span class="sourceLineNo">741</span> return false;<a name="line.741"></a>
-<span class="sourceLineNo">742</span> }<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span> /**<a name="line.744"></a>
-<span class="sourceLineNo">745</span> * Check if the user is this procedure's owner<a name="line.745"></a>
-<span class="sourceLineNo">746</span> * @param procId the target procedure<a name="line.746"></a>
-<span class="sourceLineNo">747</span> * @param user the user<a name="line.747"></a>
-<span class="sourceLineNo">748</span> * @return true if the user is the owner of the procedure,<a name="line.748"></a>
-<span class="sourceLineNo">749</span> * false otherwise or the owner is unknown.<a name="line.749"></a>
-<span class="sourceLineNo">750</span> */<a name="line.750"></a>
-<span class="sourceLineNo">751</span> public boolean isProcedureOwner(final long procId, final User user) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> if (user == null) {<a name="line.752"></a>
-<span class="sourceLineNo">753</span> return false;<a name="line.753"></a>
-<span class="sourceLineNo">754</span> }<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
-<span class="sourceLineNo">756</span> Procedure proc = procedures.get(procId);<a name="line.756"></a>
-<span class="sourceLineNo">757</span> if (proc != null) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return proc.getOwner().equals(user.getShortName());<a name="line.758"></a>
-<span class="sourceLineNo">759</span> }<a name="line.759"></a>
-<span class="sourceLineNo">760</span> ProcedureInfo procInfo = completed.get(procId);<a name="line.760"></a>
-<span class="sourceLineNo">761</span> if (procInfo == null) {<a name="line.761"></a>
-<span class="sourceLineNo">762</span> // Procedure either does not exist or has already completed and got cleaned up.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> // At this time, we cannot check the owner of the procedure<a name="line.763"></a>
-<span class="sourceLineNo">764</span> return false;<a name="line.764"></a>
-<span class="sourceLineNo">765</span> }<a name="line.765"></a>
-<span class="sourceLineNo">766</span> return ProcedureInfo.isProcedureOwner(procInfo, user);<a name="line.766"></a>
-<span class="sourceLineNo">767</span> }<a name="line.767"></a>
-<span class="sourceLineNo">768</span><a name="line.768"></a>
-<span class="sourceLineNo">769</span> public Map<Long, ProcedureInfo> getResults() {<a name="line.769"></a>
-<span class="sourceLineNo">770</span> return Collections.unmodifiableMap(completed);<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span> public Procedure getProcedure(final long procId) {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> return procedures.get(procId);<a name="line.774"></a>
-<span class="sourceLineNo">775</span> }<a name="line.775"></a>
-<span class="sourceLineNo">776</span><a name="line.776"></a>
-<span class="sourceLineNo">777</span> protected ProcedureRunnableSet getRunnableSet() {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> return runnables;<a name="line.778"></a>
-<span class="sourceLineNo">779</span> }<a name="line.779"></a>
-<span class="sourceLineNo">780</span><a name="line.780"></a>
-<span class="sourceLineNo">781</span> /**<a name="line.781"></a>
-<span class="sourceLineNo">782</span> * Execution loop (N threads)<a name="line.782"></a>
-<span class="sourceLineNo">783</span> * while the executor is in a running state,<a name="line.783"></a>
-<span class="sourceLineNo">784</span> * fetch a procedure from the runnables queue and start the execution.<a name="line.784"></a>
-<span class="sourceLineNo">785</span> */<a name="line.785"></a>
-<span class="sourceLineNo">786</span> private void execLoop() {<a name="line.786"></a>
-<span class="sourceLineNo">787</span> while (isRunning()) {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> Procedure proc = runnables.poll();<a name="line.788"></a>
-<span class="sourceLineNo">789</span> if (proc == null) continue;<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span> try {<a name="line.791"></a>
-<span class="sourceLineNo">792</span> activeExecutorCount.incrementAndGet();<a name="line.792"></a>
-<span class="sourceLineNo">793</span> execLoop(proc);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> } finally {<a name="line.794"></a>
-<span class="sourceLineNo">795</span> activeExecutorCount.decrementAndGet();<a name="line.795"></a>
-<span class="sourceLineNo">796</span> }<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> }<a name="line.798"></a>
-<span class="sourceLineNo">799</span><a name="line.799"></a>
-<span class="sourceLineNo">800</span> private void execLoop(Procedure proc) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span> if (LOG.isTraceEnabled()) {<a name="line.801"></a>
-<span class="sourceLineNo">802</span> LOG.trace("Trying to start the execution of " + proc);<a name="line.802"></a>
-<span class="sourceLineNo">803</span> }<a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span> Long rootProcId = getRootProcedureId(proc);<a name="line.805"></a>
-<span class="sourceLineNo">806</span> if (rootProcId == null) {<a name="line.806"></a>
-<span class="sourceLineNo">807</span> // The 'proc' was ready to run but the root procedure was rolledback<a name="line.807"></a>
-<span class="sourceLineNo">808</span> executeRollback(proc);<a name="line.808"></a>
-<span class="sourceLineNo">809</span> return;<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span><a name="line.811"></a>
-<span class="sourceLineNo">812</span> RootProcedureState procStack = rollbackStack.get(rootProcId);<a name="line.812"></a>
-<span class="sourceLineNo">813</span> if (procStack == null) return;<a name="line.813"></a>
+<span class="sourceLineNo">684</span> public ProcedureInfo getResult(final long procId) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> return completed.get(procId);<a name="line.685"></a>
+<span class="sourceLineNo">686</span> }<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span> /**<a name="line.688"></a>
+<span class="sourceLineNo">689</span> * Return true if the procedure is finished.<a name="line.689"></a>
+<span class="sourceLineNo">690</span> * The state may be "completed successfully" or "failed and rolledback".<a name="line.690"></a>
+<span class="sourceLineNo">691</span> * Use getResult() to check the state or get the result data.<a name="line.691"></a>
+<span class="sourceLineNo">692</span> * @param procId the ID of the procedure to check<a name="line.692"></a>
+<span class="sourceLineNo">693</span> * @return true if the procedure execution is finished, otherwise false.<a name="line.693"></a>
+<span class="sourceLineNo">694</span> */<a name="line.694"></a>
+<span class="sourceLineNo">695</span> public boolean isFinished(final long procId) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> return completed.containsKey(procId);<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">699</span> /**<a name="line.699"></a>
+<span class="sourceLineNo">700</span> * Return true if the procedure is started.<a name="line.700"></a>
+<span class="sourceLineNo">701</span> * @param procId the ID of the procedure to check<a name="line.701"></a>
+<span class="sourceLineNo">702</span> * @return true if the procedure execution is started, otherwise false.<a name="line.702"></a>
+<span class="sourceLineNo">703</span> */<a name="line.703"></a>
+<span class="sourceLineNo">704</span> public boolean isStarted(final long procId) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> Procedure proc = procedures.get(procId);<a name="line.705"></a>
+<span class="sourceLineNo">706</span> if (proc == null) {<a name="line.706"></a>
+<span class="sourceLineNo">707</span> return completed.get(procId) != null;<a name="line.707"></a>
+<span class="sourceLineNo">708</span> }<a name="line.708"></a>
+<span class="sourceLineNo">709</span> return proc.wasExecuted();<a name="line.709"></a>
+<span class="sourceLineNo">710</span> }<a name="line.710"></a>
+<span class="sourceLineNo">711</span><a name="line.711"></a>
+<span class="sourceLineNo">712</span> /**<a name="line.712"></a>
+<span class="sourceLineNo">713</span> * Mark the specified completed procedure, as ready to remove.<a name="line.713"></a>
+<span class="sourceLineNo">714</span> * @param procId the ID of the procedure to remove<a name="line.714"></a>
+<span class="sourceLineNo">715</span> */<a name="line.715"></a>
+<span class="sourceLineNo">716</span> public void removeResult(final long procId) {<a name="line.716"></a>
+<span class="sourceLineNo">717</span> ProcedureInfo result = completed.get(procId);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> if (result == null) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> assert !procedures.containsKey(procId) : "procId=" + procId + " is still running";<a name="line.719"></a>
+<span class="sourceLineNo">720</span> if (LOG.isDebugEnabled()) {<a name="line.720"></a>
+<span class="sourceLineNo">721</span> LOG.debug("Procedure procId=" + procId + " already removed by the cleaner.");<a name="line.721"></a>
+<span class="sourceLineNo">722</span> }<a name="line.722"></a>
+<span class="sourceLineNo">723</span> return;<a name="line.723"></a>
+<span class="sourceLineNo">724</span> }<a name="line.724"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span> // The CompletedProcedureCleaner will take care of deletion, once the TTL is expired.<a name="line.726"></a>
+<span class="sourceLineNo">727</span> result.setClientAckTime(EnvironmentEdgeManager.currentTime());<a name="line.727"></a>
+<span class="sourceLineNo">728</span> }<a name="line.728"></a>
+<span class="sourceLineNo">729</span><a name="line.729"></a>
+<span class="sourceLineNo">730</span> /**<a name="line.730"></a>
+<span class="sourceLineNo">731</span> * Send an abort notification the specified procedure.<a name="line.731"></a>
+<span class="sourceLineNo">732</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.732"></a>
+<span class="sourceLineNo">733</span> * @param procId the procedure to abort<a name="line.733"></a>
+<span class="sourceLineNo">734</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.734"></a>
+<span class="sourceLineNo">735</span> */<a name="line.735"></a>
+<span class="sourceLineNo">736</span> public boolean abort(final long procId) {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> return abort(procId, true);<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span><a name="line.739"></a>
+<span class="sourceLineNo">740</span> /**<a name="line.740"></a>
+<span class="sourceLineNo">741</span> * Send an abort notification the specified procedure.<a name="line.741"></a>
+<span class="sourceLineNo">742</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> * @param procId the procedure to abort<a name="line.743"></a>
+<span class="sourceLineNo">744</span> * @param mayInterruptIfRunning if the proc completed at least one step, should it be aborted?<a name="line.744"></a>
+<span class="sourceLineNo">745</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.745"></a>
+<span class="sourceLineNo">746</span> */<a name="line.746"></a>
+<span class="sourceLineNo">747</span> public boolean abort(final long procId, final boolean mayInterruptIfRunning) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> Procedure proc = procedures.get(procId);<a name="line.748"></a>
+<span class="sourceLineNo">749</span> if (proc != null) {<a name="line.749"></a>
+<span class="sourceLineNo">750</span> if (!mayInterruptIfRunning && proc.wasExecuted()) {<a name="line.750"></a>
+<span class="sourceLineNo">751</span> return false;<a name="line.751"></a>
+<span class="sourceLineNo">752</span> } else {<a name="line.752"></a>
+<span class="sourceLineNo">753</span> return proc.abort(getEnvironment());<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span> }<a name="line.755"></a>
+<span class="sourceLineNo">756</span> return false;<a name="line.756"></a>
+<span class="sourceLineNo">757</span> }<a name="line.757"></a>
+<span class="sourceLineNo">758</span><a name="line.758"></a>
+<span class="sourceLineNo">759</span> /**<a name="line.759"></a>
+<span class="sourceLineNo">760</span> * Check if the user is this procedure's owner<a name="line.760"></a>
+<span class="sourceLineNo">761</span> * @param procId the target procedure<a name="line.761"></a>
+<span class="sourceLineNo">762</span> * @param user the user<a name="line.762"></a>
+<span class="sourceLineNo">763</span> * @return true if the user is the owner of the procedure,<a name="line.763"></a>
+<span class="sourceLineNo">764</span> * false otherwise or the owner is unknown.<a name="line.764"></a>
+<span class="sourceLineNo">765</span> */<a name="line.765"></a>
+<span class="sourceLineNo">766</span> public boolean isProcedureOwner(final long procId, final User user) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> if (user == null) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> return false;<a name="line.768"></a>
+<span class="sourceLineNo">769</span> }<a name="line.769"></a>
+<span class="sourceLineNo">770</span><a name="line.770"></a>
+<span class="sourceLineNo">771</span> Procedure proc = procedures.get(procId);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> if (proc != null) {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return proc.getOwner().equals(user.getShortName());<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> ProcedureInfo procInfo = completed.get(procId);<a name="line.775"></a>
+<span class="sourceLineNo">776</span> if (procInfo == null) {<a name="line.776"></a>
+<span class="sourceLineNo">777</span> // Procedure either does not exist or has already completed and got cleaned up.<a name="line.777"></a>
+<span class="sourceLineNo">778</span> // At this time, we cannot check the owner of the procedure<a name="line.778"></a>
+<span class="sourceLineNo">779</span> return false;<a name="line.779"></a>
+<span class="sourceLineNo">780</span> }<a name="line.780"></a>
+<span class="sourceLineNo">781</span> return ProcedureInfo.isProcedureOwner(procInfo, user);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span> pu
<TRUNCATED>