You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/04/06 20:01:13 UTC
[12/25] hbase-site git commit: Published site at
9109803891e256f8c047af72572f07695e604a3f.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ddcd3ebf/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.TimeoutExecutorThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.TimeoutExecutorThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.TimeoutExecutorThread.html
index 35cebd9..b6b4cb6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.TimeoutExecutorThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.TimeoutExecutorThread.html
@@ -321,7 +321,7 @@
<span class="sourceLineNo">313</span> final NonceKey nonceKey;<a name="line.313"></a>
<span class="sourceLineNo">314</span> final long procId;<a name="line.314"></a>
<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (procIter.isNextCompleted()) {<a name="line.316"></a>
+<span class="sourceLineNo">316</span> if (procIter.isNextFinished()) {<a name="line.316"></a>
<span class="sourceLineNo">317</span> ProcedureInfo proc = procIter.nextAsProcedureInfo();<a name="line.317"></a>
<span class="sourceLineNo">318</span> nonceKey = proc.getNonceKey();<a name="line.318"></a>
<span class="sourceLineNo">319</span> procId = proc.getProcId();<a name="line.319"></a>
@@ -359,7 +359,7 @@
<span class="sourceLineNo">351</span> HashSet<Procedure> waitingSet = null;<a name="line.351"></a>
<span class="sourceLineNo">352</span> procIter.reset();<a name="line.352"></a>
<span class="sourceLineNo">353</span> while (procIter.hasNext()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (procIter.isNextCompleted()) {<a name="line.354"></a>
+<span class="sourceLineNo">354</span> if (procIter.isNextFinished()) {<a name="line.354"></a>
<span class="sourceLineNo">355</span> procIter.skipNext();<a name="line.355"></a>
<span class="sourceLineNo">356</span> continue;<a name="line.356"></a>
<span class="sourceLineNo">357</span> }<a name="line.357"></a>
@@ -405,1450 +405,1448 @@
<span class="sourceLineNo">397</span> }<a name="line.397"></a>
<span class="sourceLineNo">398</span> waitingSet.add(proc);<a name="line.398"></a>
<span class="sourceLineNo">399</span> break;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> case FINISHED:<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (proc.hasException()) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> // add the proc to the scheduler to perform the rollback<a name="line.402"></a>
-<span class="sourceLineNo">403</span> scheduler.addBack(proc);<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span> break;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> case ROLLEDBACK:<a name="line.406"></a>
-<span class="sourceLineNo">407</span> case INITIALIZING:<a name="line.407"></a>
-<span class="sourceLineNo">408</span> String msg = "Unexpected " + proc.getState() + " state for " + proc;<a name="line.408"></a>
-<span class="sourceLineNo">409</span> LOG.error(msg);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> throw new UnsupportedOperationException(msg);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> default:<a name="line.411"></a>
-<span class="sourceLineNo">412</span> break;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> // 3. Validate the stacks<a name="line.416"></a>
-<span class="sourceLineNo">417</span> int corruptedCount = 0;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> Iterator<Map.Entry<Long, RootProcedureState>> itStack = rollbackStack.entrySet().iterator();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> while (itStack.hasNext()) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Map.Entry<Long, RootProcedureState> entry = itStack.next();<a name="line.420"></a>
-<span class="sourceLineNo">421</span> RootProcedureState procStack = entry.getValue();<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (procStack.isValid()) continue;<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> for (Procedure proc: procStack.getSubproceduresStack()) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> LOG.error("Corrupted " + proc);<a name="line.425"></a>
-<span class="sourceLineNo">426</span> procedures.remove(proc.getProcId());<a name="line.426"></a>
-<span class="sourceLineNo">427</span> runnableList.remove(proc);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> if (waitingSet != null) waitingSet.remove(proc);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> corruptedCount++;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> itStack.remove();<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> if (abortOnCorruption && corruptedCount > 0) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> throw new IOException("found " + corruptedCount + " procedures on replay");<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span> // 4. Push the procedures to the timeout executor<a name="line.438"></a>
-<span class="sourceLineNo">439</span> if (waitingSet != null && !waitingSet.isEmpty()) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> for (Procedure proc: waitingSet) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> proc.afterReplay(getEnvironment());<a name="line.441"></a>
-<span class="sourceLineNo">442</span> timeoutExecutor.add(proc);<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><a name="line.445"></a>
-<span class="sourceLineNo">446</span> // 5. Push the procedure to the scheduler<a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (!runnableList.isEmpty()) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> // TODO: See ProcedureWALFormatReader#hasFastStartSupport<a name="line.448"></a>
-<span class="sourceLineNo">449</span> // some procedure may be started way before this stuff.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for (int i = runnableList.size() - 1; i >= 0; --i) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> Procedure proc = runnableList.get(i);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> proc.afterReplay(getEnvironment());<a name="line.452"></a>
-<span class="sourceLineNo">453</span> if (!proc.hasParent()) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> sendProcedureLoadedNotification(proc.getProcId());<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> if (proc.wasExecuted()) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> scheduler.addFront(proc);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> } else {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> // if it was not in execution, it can wait.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> scheduler.addBack(proc);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<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> * Start the procedure executor.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * It calls ProcedureStore.recoverLease() and ProcedureStore.load() to<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * recover the lease, and ensure a single executor, and start the procedure<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * replay to resume and recover the previous pending and in-progress perocedures.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> *<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param numThreads number of threads available for procedure execution.<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @param abortOnCorruption true if you want to abort your service in case<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * a corrupted procedure is found on replay. otherwise false.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> */<a name="line.475"></a>
-<span class="sourceLineNo">476</span> public void start(int numThreads, boolean abortOnCorruption) throws IOException {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (running.getAndSet(true)) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> LOG.warn("Already running");<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return;<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">482</span> // We have numThreads executor + one timer thread used for timing out<a name="line.482"></a>
-<span class="sourceLineNo">483</span> // procedures and triggering periodic procedures.<a name="line.483"></a>
-<span class="sourceLineNo">484</span> this.corePoolSize = numThreads;<a name="line.484"></a>
-<span class="sourceLineNo">485</span> LOG.info("Starting executor worker threads=" + corePoolSize);<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span> // Create the Thread Group for the executors<a name="line.487"></a>
-<span class="sourceLineNo">488</span> threadGroup = new ThreadGroup("ProcedureExecutor");<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> // Create the timeout executor<a name="line.490"></a>
-<span class="sourceLineNo">491</span> timeoutExecutor = new TimeoutExecutorThread(threadGroup);<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span> // Create the workers<a name="line.493"></a>
-<span class="sourceLineNo">494</span> workerId.set(0);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> workerThreads = new CopyOnWriteArrayList<>();<a name="line.495"></a>
-<span class="sourceLineNo">496</span> for (int i = 0; i < corePoolSize; ++i) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> workerThreads.add(new WorkerThread(threadGroup));<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
+<span class="sourceLineNo">400</span> case FAILED:<a name="line.400"></a>
+<span class="sourceLineNo">401</span> // add the proc to the scheduler to perform the rollback<a name="line.401"></a>
+<span class="sourceLineNo">402</span> scheduler.addBack(proc);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> break;<a name="line.403"></a>
+<span class="sourceLineNo">404</span> case ROLLEDBACK:<a name="line.404"></a>
+<span class="sourceLineNo">405</span> case INITIALIZING:<a name="line.405"></a>
+<span class="sourceLineNo">406</span> String msg = "Unexpected " + proc.getState() + " state for " + proc;<a name="line.406"></a>
+<span class="sourceLineNo">407</span> LOG.error(msg);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> throw new UnsupportedOperationException(msg);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> default:<a name="line.409"></a>
+<span class="sourceLineNo">410</span> break;<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> // 3. Validate the stacks<a name="line.414"></a>
+<span class="sourceLineNo">415</span> int corruptedCount = 0;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Iterator<Map.Entry<Long, RootProcedureState>> itStack = rollbackStack.entrySet().iterator();<a name="line.416"></a>
+<span class="sourceLineNo">417</span> while (itStack.hasNext()) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> Map.Entry<Long, RootProcedureState> entry = itStack.next();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> RootProcedureState procStack = entry.getValue();<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (procStack.isValid()) continue;<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> for (Procedure proc: procStack.getSubproceduresStack()) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> LOG.error("Corrupted " + proc);<a name="line.423"></a>
+<span class="sourceLineNo">424</span> procedures.remove(proc.getProcId());<a name="line.424"></a>
+<span class="sourceLineNo">425</span> runnableList.remove(proc);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (waitingSet != null) waitingSet.remove(proc);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> corruptedCount++;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span> itStack.remove();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> if (abortOnCorruption && corruptedCount > 0) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> throw new IOException("found " + corruptedCount + " procedures on replay");<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> // 4. Push the procedures to the timeout executor<a name="line.436"></a>
+<span class="sourceLineNo">437</span> if (waitingSet != null && !waitingSet.isEmpty()) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> for (Procedure proc: waitingSet) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> proc.afterReplay(getEnvironment());<a name="line.439"></a>
+<span class="sourceLineNo">440</span> timeoutExecutor.add(proc);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> // 5. Push the procedure to the scheduler<a name="line.444"></a>
+<span class="sourceLineNo">445</span> if (!runnableList.isEmpty()) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // TODO: See ProcedureWALFormatReader#hasFastStartSupport<a name="line.446"></a>
+<span class="sourceLineNo">447</span> // some procedure may be started way before this stuff.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> for (int i = runnableList.size() - 1; i >= 0; --i) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> Procedure proc = runnableList.get(i);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> proc.afterReplay(getEnvironment());<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (!proc.hasParent()) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> sendProcedureLoadedNotification(proc.getProcId());<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (proc.wasExecuted()) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> scheduler.addFront(proc);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> } else {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> // if it was not in execution, it can wait.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> scheduler.addBack(proc);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span> }<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> * Start the procedure executor.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * It calls ProcedureStore.recoverLease() and ProcedureStore.load() to<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * recover the lease, and ensure a single executor, and start the procedure<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * replay to resume and recover the previous pending and in-progress perocedures.<a name="line.468"></a>
+<span class="sourceLineNo">469</span> *<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @param numThreads number of threads available for procedure execution.<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * @param abortOnCorruption true if you want to abort your service in case<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * a corrupted procedure is found on replay. otherwise false.<a name="line.472"></a>
+<span class="sourceLineNo">473</span> */<a name="line.473"></a>
+<span class="sourceLineNo">474</span> public void start(int numThreads, boolean abortOnCorruption) throws IOException {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (running.getAndSet(true)) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> LOG.warn("Already running");<a name="line.476"></a>
+<span class="sourceLineNo">477</span> return;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span> // We have numThreads executor + one timer thread used for timing out<a name="line.480"></a>
+<span class="sourceLineNo">481</span> // procedures and triggering periodic procedures.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> this.corePoolSize = numThreads;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> LOG.info("Starting executor worker threads=" + corePoolSize);<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> // Create the Thread Group for the executors<a name="line.485"></a>
+<span class="sourceLineNo">486</span> threadGroup = new ThreadGroup("ProcedureExecutor");<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> // Create the timeout executor<a name="line.488"></a>
+<span class="sourceLineNo">489</span> timeoutExecutor = new TimeoutExecutorThread(threadGroup);<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span> // Create the workers<a name="line.491"></a>
+<span class="sourceLineNo">492</span> workerId.set(0);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> workerThreads = new CopyOnWriteArrayList<>();<a name="line.493"></a>
+<span class="sourceLineNo">494</span> for (int i = 0; i < corePoolSize; ++i) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span> workerThreads.add(new WorkerThread(threadGroup));<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> long st, et;<a name="line.498"></a>
<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> long st, et;<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span> // Acquire the store lease.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> st = EnvironmentEdgeManager.currentTime();<a name="line.503"></a>
-<span class="sourceLineNo">504</span> store.recoverLease();<a name="line.504"></a>
-<span class="sourceLineNo">505</span> et = EnvironmentEdgeManager.currentTime();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> LOG.info(String.format("Recover store (%s) lease: %s",<a name="line.506"></a>
-<span class="sourceLineNo">507</span> store.getClass().getSimpleName(), StringUtils.humanTimeDiff(et - st)));<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> // start the procedure scheduler<a name="line.509"></a>
-<span class="sourceLineNo">510</span> scheduler.start();<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> // TODO: Split in two steps.<a name="line.512"></a>
-<span class="sourceLineNo">513</span> // TODO: Handle corrupted procedures (currently just a warn)<a name="line.513"></a>
-<span class="sourceLineNo">514</span> // The first one will make sure that we have the latest id,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> // so we can start the threads and accept new procedures.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> // The second step will do the actual load of old procedures.<a name="line.516"></a>
-<span class="sourceLineNo">517</span> st = EnvironmentEdgeManager.currentTime();<a name="line.517"></a>
-<span class="sourceLineNo">518</span> load(abortOnCorruption);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> et = EnvironmentEdgeManager.currentTime();<a name="line.519"></a>
-<span class="sourceLineNo">520</span> LOG.info(String.format("Load store (%s): %s",<a name="line.520"></a>
-<span class="sourceLineNo">521</span> store.getClass().getSimpleName(), StringUtils.humanTimeDiff(et - st)));<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> // Start the executors. Here we must have the lastProcId set.<a name="line.523"></a>
-<span class="sourceLineNo">524</span> if (LOG.isTraceEnabled()) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> LOG.trace("Start workers " + workerThreads.size());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> timeoutExecutor.start();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> for (WorkerThread worker: workerThreads) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> worker.start();<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> // Internal chores<a name="line.532"></a>
-<span class="sourceLineNo">533</span> timeoutExecutor.add(new WorkerMonitor());<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span> // Add completed cleaner chore<a name="line.535"></a>
-<span class="sourceLineNo">536</span> addChore(new CompletedProcedureCleaner(conf, store, completed, nonceKeysToProcIdsMap));<a name="line.536"></a>
-<span class="sourceLineNo">537</span> }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> public void stop() {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (!running.getAndSet(false)) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> return;<a name="line.541"></a>
-<span class="sourceLineNo">542</span> }<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Stopping");<a name="line.544"></a>
-<span class="sourceLineNo">545</span> scheduler.stop();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> timeoutExecutor.sendStopSignal();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> @VisibleForTesting<a name="line.549"></a>
-<span class="sourceLineNo">550</span> public void join() {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> assert !isRunning() : "expected not running";<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> // stop the timeout executor<a name="line.553"></a>
-<span class="sourceLineNo">554</span> timeoutExecutor.awaitTermination();<a name="line.554"></a>
-<span class="sourceLineNo">555</span> timeoutExecutor = null;<a name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> // stop the worker threads<a name="line.557"></a>
-<span class="sourceLineNo">558</span> for (WorkerThread worker: workerThreads) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> worker.awaitTermination();<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> workerThreads = null;<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span> // Destroy the Thread Group for the executors<a name="line.563"></a>
-<span class="sourceLineNo">564</span> try {<a name="line.564"></a>
-<span class="sourceLineNo">565</span> threadGroup.destroy();<a name="line.565"></a>
-<span class="sourceLineNo">566</span> } catch (IllegalThreadStateException e) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> LOG.error("Thread group " + threadGroup + " contains running threads");<a name="line.567"></a>
-<span class="sourceLineNo">568</span> threadGroup.list();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } finally {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> threadGroup = null;<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> // reset the in-memory state for testing<a name="line.573"></a>
-<span class="sourceLineNo">574</span> completed.clear();<a name="line.574"></a>
-<span class="sourceLineNo">575</span> rollbackStack.clear();<a name="line.575"></a>
-<span class="sourceLineNo">576</span> procedures.clear();<a name="line.576"></a>
-<span class="sourceLineNo">577</span> nonceKeysToProcIdsMap.clear();<a name="line.577"></a>
-<span class="sourceLineNo">578</span> scheduler.clear();<a name="line.578"></a>
-<span class="sourceLineNo">579</span> lastProcId.set(-1);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span> public void refreshConfiguration(final Configuration conf) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> this.conf = conf;<a name="line.583"></a>
-<span class="sourceLineNo">584</span> setKeepAliveTime(conf.getLong(WORKER_KEEP_ALIVE_TIME_CONF_KEY,<a name="line.584"></a>
-<span class="sourceLineNo">585</span> DEFAULT_WORKER_KEEP_ALIVE_TIME), TimeUnit.MILLISECONDS);<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">500</span> // Acquire the store lease.<a name="line.500"></a>
+<span class="sourceLineNo">501</span> st = EnvironmentEdgeManager.currentTime();<a name="line.501"></a>
+<span class="sourceLineNo">502</span> store.recoverLease();<a name="line.502"></a>
+<span class="sourceLineNo">503</span> et = EnvironmentEdgeManager.currentTime();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> LOG.info(String.format("Recover store (%s) lease: %s",<a name="line.504"></a>
+<span class="sourceLineNo">505</span> store.getClass().getSimpleName(), StringUtils.humanTimeDiff(et - st)));<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> // start the procedure scheduler<a name="line.507"></a>
+<span class="sourceLineNo">508</span> scheduler.start();<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> st = EnvironmentEdgeManager.currentTime();<a name="line.515"></a>
+<span class="sourceLineNo">516</span> load(abortOnCorruption);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> et = EnvironmentEdgeManager.currentTime();<a name="line.517"></a>
+<span class="sourceLineNo">518</span> LOG.info(String.format("Load store (%s): %s",<a name="line.518"></a>
+<span class="sourceLineNo">519</span> store.getClass().getSimpleName(), StringUtils.humanTimeDiff(et - st)));<a name="line.519"></a>
+<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">521</span> // Start the executors. Here we must have the lastProcId set.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (LOG.isTraceEnabled()) {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> LOG.trace("Start workers " + workerThreads.size());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> timeoutExecutor.start();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> for (WorkerThread worker: workerThreads) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> worker.start();<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> // Internal chores<a name="line.530"></a>
+<span class="sourceLineNo">531</span> timeoutExecutor.add(new WorkerMonitor());<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> // Add completed cleaner chore<a name="line.533"></a>
+<span class="sourceLineNo">534</span> addChore(new CompletedProcedureCleaner(conf, store, completed, nonceKeysToProcIdsMap));<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> public void stop() {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> if (!running.getAndSet(false)) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span><a name="line.541"></a>
+<span class="sourceLineNo">542</span> LOG.info("Stopping");<a name="line.542"></a>
+<span class="sourceLineNo">543</span> scheduler.stop();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> timeoutExecutor.sendStopSignal();<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> @VisibleForTesting<a name="line.547"></a>
+<span class="sourceLineNo">548</span> public void join() {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> assert !isRunning() : "expected not running";<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span> // stop the timeout executor<a name="line.551"></a>
+<span class="sourceLineNo">552</span> timeoutExecutor.awaitTermination();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> timeoutExecutor = null;<a name="line.553"></a>
+<span class="sourceLineNo">554</span><a name="line.554"></a>
+<span class="sourceLineNo">555</span> // stop the worker threads<a name="line.555"></a>
+<span class="sourceLineNo">556</span> for (WorkerThread worker: workerThreads) {<a name="line.556"></a>
+<span class="sourceLineNo">557</span> worker.awaitTermination();<a name="line.557"></a>
+<span class="sourceLineNo">558</span> }<a name="line.558"></a>
+<span class="sourceLineNo">559</span> workerThreads = null;<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> // Destroy the Thread Group for the executors<a name="line.561"></a>
+<span class="sourceLineNo">562</span> try {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> threadGroup.destroy();<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (IllegalThreadStateException e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> LOG.error("Thread group " + threadGroup + " contains running threads");<a name="line.565"></a>
+<span class="sourceLineNo">566</span> threadGroup.list();<a name="line.566"></a>
+<span class="sourceLineNo">567</span> } finally {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> threadGroup = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> }<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span> // reset the in-memory state for testing<a name="line.571"></a>
+<span class="sourceLineNo">572</span> completed.clear();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> rollbackStack.clear();<a name="line.573"></a>
+<span class="sourceLineNo">574</span> procedures.clear();<a name="line.574"></a>
+<span class="sourceLineNo">575</span> nonceKeysToProcIdsMap.clear();<a name="line.575"></a>
+<span class="sourceLineNo">576</span> scheduler.clear();<a name="line.576"></a>
+<span class="sourceLineNo">577</span> lastProcId.set(-1);<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 void refreshConfiguration(final Configuration conf) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span> this.conf = conf;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> setKeepAliveTime(conf.getLong(WORKER_KEEP_ALIVE_TIME_CONF_KEY,<a name="line.582"></a>
+<span class="sourceLineNo">583</span> DEFAULT_WORKER_KEEP_ALIVE_TIME), TimeUnit.MILLISECONDS);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> }<a name="line.584"></a>
+<span class="sourceLineNo">585</span><a name="line.585"></a>
+<span class="sourceLineNo">586</span> // ==========================================================================<a name="line.586"></a>
+<span class="sourceLineNo">587</span> // Accessors<a name="line.587"></a>
<span class="sourceLineNo">588</span> // ==========================================================================<a name="line.588"></a>
-<span class="sourceLineNo">589</span> // Accessors<a name="line.589"></a>
-<span class="sourceLineNo">590</span> // ==========================================================================<a name="line.590"></a>
-<span class="sourceLineNo">591</span> public boolean isRunning() {<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return running.get();<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> /**<a name="line.595"></a>
-<span class="sourceLineNo">596</span> * @return the current number of worker threads.<a name="line.596"></a>
-<span class="sourceLineNo">597</span> */<a name="line.597"></a>
-<span class="sourceLineNo">598</span> public int getWorkerThreadCount() {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> return workerThreads.size();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> }<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span> /**<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @return the core pool size settings.<a name="line.603"></a>
-<span class="sourceLineNo">604</span> */<a name="line.604"></a>
-<span class="sourceLineNo">605</span> public int getCorePoolSize() {<a name="line.605"></a>
-<span class="sourceLineNo">606</span> return corePoolSize;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> public int getActiveExecutorCount() {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return activeExecutorCount.get();<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> public TEnvironment getEnvironment() {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> return this.environment;<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> public ProcedureStore getStore() {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> return this.store;<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> protected ProcedureScheduler getScheduler() {<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return scheduler;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> public void setKeepAliveTime(final long keepAliveTime, final TimeUnit timeUnit) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> this.keepAliveTime = timeUnit.toMillis(keepAliveTime);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> this.scheduler.signalAll();<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> public long getKeepAliveTime(final TimeUnit timeUnit) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> return timeUnit.convert(keepAliveTime, TimeUnit.MILLISECONDS);<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">589</span> public boolean isRunning() {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> return running.get();<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> /**<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return the current number of worker threads.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public int getWorkerThreadCount() {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return workerThreads.size();<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * @return the core pool size settings.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> */<a name="line.602"></a>
+<span class="sourceLineNo">603</span> public int getCorePoolSize() {<a name="line.603"></a>
+<span class="sourceLineNo">604</span> return corePoolSize;<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> public int getActiveExecutorCount() {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> return activeExecutorCount.get();<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span><a name="line.610"></a>
+<span class="sourceLineNo">611</span> public TEnvironment getEnvironment() {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> return this.environment;<a name="line.612"></a>
+<span class="sourceLineNo">613</span> }<a name="line.613"></a>
+<span class="sourceLineNo">614</span><a name="line.614"></a>
+<span class="sourceLineNo">615</span> public ProcedureStore getStore() {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return this.store;<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span><a name="line.618"></a>
+<span class="sourceLineNo">619</span> protected ProcedureScheduler getScheduler() {<a name="line.619"></a>
+<span class="sourceLineNo">620</span> return scheduler;<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> public void setKeepAliveTime(final long keepAliveTime, final TimeUnit timeUnit) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.keepAliveTime = timeUnit.toMillis(keepAliveTime);<a name="line.624"></a>
+<span class="sourceLineNo">625</span> this.scheduler.signalAll();<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> public long getKeepAliveTime(final TimeUnit timeUnit) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> return timeUnit.convert(keepAliveTime, TimeUnit.MILLISECONDS);<a name="line.629"></a>
+<span class="sourceLineNo">630</span> }<a name="line.630"></a>
+<span class="sourceLineNo">631</span><a name="line.631"></a>
+<span class="sourceLineNo">632</span> // ==========================================================================<a name="line.632"></a>
+<span class="sourceLineNo">633</span> // Submit/Remove Chores<a name="line.633"></a>
<span class="sourceLineNo">634</span> // ==========================================================================<a name="line.634"></a>
-<span class="sourceLineNo">635</span> // Submit/Remove Chores<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // ==========================================================================<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> * Add a chore procedure to the executor<a name="line.639"></a>
-<span class="sourceLineNo">640</span> * @param chore the chore to add<a name="line.640"></a>
-<span class="sourceLineNo">641</span> */<a name="line.641"></a>
-<span class="sourceLineNo">642</span> public void addChore(final ProcedureInMemoryChore chore) {<a name="line.642"></a>
-<span class="sourceLineNo">643</span> chore.setState(ProcedureState.WAITING_TIMEOUT);<a name="line.643"></a>
-<span class="sourceLineNo">644</span> timeoutExecutor.add(chore);<a name="line.644"></a>
-<span class="sourceLineNo">645</span> }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span> /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span> * Remove a chore procedure from the executor<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @param chore the chore to remove<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * @return whether the chore is removed, or it will be removed later<a name="line.650"></a>
-<span class="sourceLineNo">651</span> */<a name="line.651"></a>
-<span class="sourceLineNo">652</span> public boolean removeChore(final ProcedureInMemoryChore chore) {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> chore.setState(ProcedureState.FINISHED);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> return timeoutExecutor.remove(chore);<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">635</span><a name="line.635"></a>
+<span class="sourceLineNo">636</span> /**<a name="line.636"></a>
+<span class="sourceLineNo">637</span> * Add a chore procedure to the executor<a name="line.637"></a>
+<span class="sourceLineNo">638</span> * @param chore the chore to add<a name="line.638"></a>
+<span class="sourceLineNo">639</span> */<a name="line.639"></a>
+<span class="sourceLineNo">640</span> public void addChore(final ProcedureInMemoryChore chore) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> chore.setState(ProcedureState.WAITING_TIMEOUT);<a name="line.641"></a>
+<span class="sourceLineNo">642</span> timeoutExecutor.add(chore);<a name="line.642"></a>
+<span class="sourceLineNo">643</span> }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span> /**<a name="line.645"></a>
+<span class="sourceLineNo">646</span> * Remove a chore procedure from the executor<a name="line.646"></a>
+<span class="sourceLineNo">647</span> * @param chore the chore to remove<a name="line.647"></a>
+<span class="sourceLineNo">648</span> * @return whether the chore is removed, or it will be removed later<a name="line.648"></a>
+<span class="sourceLineNo">649</span> */<a name="line.649"></a>
+<span class="sourceLineNo">650</span> public boolean removeChore(final ProcedureInMemoryChore chore) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> chore.setState(ProcedureState.SUCCESS);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> return timeoutExecutor.remove(chore);<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> // ==========================================================================<a name="line.655"></a>
+<span class="sourceLineNo">656</span> // Nonce Procedure helpers<a name="line.656"></a>
<span class="sourceLineNo">657</span> // ==========================================================================<a name="line.657"></a>
-<span class="sourceLineNo">658</span> // Nonce Procedure helpers<a name="line.658"></a>
-<span class="sourceLineNo">659</span> // ==========================================================================<a name="line.659"></a>
-<span class="sourceLineNo">660</span> /**<a name="line.660"></a>
-<span class="sourceLineNo">661</span> * Create a NoneKey from the specified nonceGroup and nonce.<a name="line.661"></a>
-<span class="sourceLineNo">662</span> * @param nonceGroup<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * @param nonce<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * @return the generated NonceKey<a name="line.664"></a>
-<span class="sourceLineNo">665</span> */<a name="line.665"></a>
-<span class="sourceLineNo">666</span> public NonceKey createNonceKey(final long nonceGroup, final long nonce) {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> return (nonce == HConstants.NO_NONCE) ? null : new NonceKey(nonceGroup, nonce);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span> /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span> * Register a nonce for a procedure that is going to be submitted.<a name="line.671"></a>
-<span class="sourceLineNo">672</span> * A procId will be reserved and on submitProcedure(),<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * the procedure with the specified nonce will take the reserved ProcId.<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * If someone already reserved the nonce, this method will return the procId reserved,<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * otherwise an invalid procId will be returned. and the caller should procede<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * and submit the procedure.<a name="line.676"></a>
-<span class="sourceLineNo">677</span> *<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * @param nonceKey A unique identifier for this operation from the client or process.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * @return the procId associated with the nonce, if any otherwise an invalid procId.<a name="line.679"></a>
-<span class="sourceLineNo">680</span> */<a name="line.680"></a>
-<span class="sourceLineNo">681</span> public long registerNonce(final NonceKey nonceKey) {<a name="line.681"></a>
-<span class="sourceLineNo">682</span> if (nonceKey == null) return -1;<a name="line.682"></a>
-<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> // check if we have already a Reserved ID for the nonce<a name="line.684"></a>
-<span class="sourceLineNo">685</span> Long oldProcId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.685"></a>
-<span class="sourceLineNo">686</span> if (oldProcId == null) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> // reserve a new Procedure ID, this will be associated with the nonce<a name="line.687"></a>
-<span class="sourceLineNo">688</span> // and the procedure submitted with the specified nonce will use this ID.<a name="line.688"></a>
-<span class="sourceLineNo">689</span> final long newProcId = nextProcId();<a name="line.689"></a>
-<span class="sourceLineNo">690</span> oldProcId = nonceKeysToProcIdsMap.putIfAbsent(nonceKey, newProcId);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> if (oldProcId == null) return -1;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> // we found a registered nonce, but the procedure may not have been submitted yet.<a name="line.694"></a>
-<span class="sourceLineNo">695</span> // since the client expect the procedure to be submitted, spin here until it is.<a name="line.695"></a>
-<span class="sourceLineNo">696</span> final boolean traceEnabled = LOG.isTraceEnabled();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> while (isRunning() &&<a name="line.697"></a>
-<span class="sourceLineNo">698</span> !(procedures.containsKey(oldProcId) || completed.containsKey(oldProcId)) &&<a name="line.698"></a>
-<span class="sourceLineNo">699</span> nonceKeysToProcIdsMap.containsKey(nonceKey)) {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> if (traceEnabled) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> LOG.trace("Waiting for procId=" + oldProcId.longValue() + " to be submitted");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span> Threads.sleep(100);<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> return oldProcId.longValue();<a name="line.705"></a>
-<span class="sourceLineNo">706</span> }<a name="line.706"></a>
-<span class="sourceLineNo">707</span><a name="line.707"></a>
-<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
-<span class="sourceLineNo">709</span> * Remove the NonceKey if the procedure was not submitted to the executor.<a name="line.709"></a>
-<span class="sourceLineNo">710</span> * @param nonceKey A unique identifier for this operation from the client or process.<a name="line.710"></a>
-<span class="sourceLineNo">711</span> */<a name="line.711"></a>
-<span class="sourceLineNo">712</span> public void unregisterNonceIfProcedureWasNotSubmitted(final NonceKey nonceKey) {<a name="line.712"></a>
-<span class="sourceLineNo">713</span> if (nonceKey == null) return;<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span> final Long procId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.715"></a>
-<span class="sourceLineNo">716</span> if (procId == null) return;<a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> // if the procedure was not submitted, remove the nonce<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (!(procedures.containsKey(procId) || completed.containsKey(procId))) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span> nonceKeysToProcIdsMap.remove(nonceKey);<a name="line.720"></a>
-<span class="sourceLineNo">721</span> }<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<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> * If the failure failed before submitting it, we may want to give back the<a name="line.725"></a>
-<span class="sourceLineNo">726</span> * same error to the requests with the same nonceKey.<a name="line.726"></a>
-<span class="sourceLineNo">727</span> *<a name="line.727"></a>
-<span class="sourceLineNo">728</span> * @param nonceKey A unique identifier for this operation from the client or process<a name="line.728"></a>
-<span class="sourceLineNo">729</span> * @param procName name of the procedure, used to inform the user<a name="line.729"></a>
-<span class="sourceLineNo">730</span> * @param procOwner name of the owner of the procedure, used to inform the user<a name="line.730"></a>
-<span class="sourceLineNo">731</span> * @param exception the failure to report to the user<a name="line.731"></a>
-<span class="sourceLineNo">732</span> */<a name="line.732"></a>
-<span class="sourceLineNo">733</span> public void setFailureResultForNonce(final NonceKey nonceKey, final String procName,<a name="line.733"></a>
-<span class="sourceLineNo">734</span> final User procOwner, final IOException exception) {<a name="line.734"></a>
-<span class="sourceLineNo">735</span> if (nonceKey == null) return;<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span> final Long procId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.737"></a>
-<span class="sourceLineNo">738</span> if (procId == null || completed.containsKey(procId)) return;<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span> final long currentTime = EnvironmentEdgeManager.currentTime();<a name="line.740"></a>
-<span class="sourceLineNo">741</span> final ProcedureInfo result = new ProcedureInfo(procId.longValue(),<a name="line.741"></a>
-<span class="sourceLineNo">742</span> procName, procOwner != null ? procOwner.getShortName() : null,<a name="line.742"></a>
-<span class="sourceLineNo">743</span> ProcedureUtil.convertToProcedureState(ProcedureState.ROLLEDBACK),<a name="line.743"></a>
-<span class="sourceLineNo">744</span> -1, nonceKey, exception, currentTime, currentTime, null);<a name="line.744"></a>
-<span class="sourceLineNo">745</span> completed.putIfAbsent(procId, result);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> }<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
+<span class="sourceLineNo">658</span> /**<a name="line.658"></a>
+<span class="sourceLineNo">659</span> * Create a NoneKey from the specified nonceGroup and nonce.<a name="line.659"></a>
+<span class="sourceLineNo">660</span> * @param nonceGroup<a name="line.660"></a>
+<span class="sourceLineNo">661</span> * @param nonce<a name="line.661"></a>
+<span class="sourceLineNo">662</span> * @return the generated NonceKey<a name="line.662"></a>
+<span class="sourceLineNo">663</span> */<a name="line.663"></a>
+<span class="sourceLineNo">664</span> public NonceKey createNonceKey(final long nonceGroup, final long nonce) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> return (nonce == HConstants.NO_NONCE) ? null : new NonceKey(nonceGroup, nonce);<a name="line.665"></a>
+<span class="sourceLineNo">666</span> }<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> * Register a nonce for a procedure that is going to be submitted.<a name="line.669"></a>
+<span class="sourceLineNo">670</span> * A procId will be reserved and on submitProcedure(),<a name="line.670"></a>
+<span class="sourceLineNo">671</span> * the procedure with the specified nonce will take the reserved ProcId.<a name="line.671"></a>
+<span class="sourceLineNo">672</span> * If someone already reserved the nonce, this method will return the procId reserved,<a name="line.672"></a>
+<span class="sourceLineNo">673</span> * otherwise an invalid procId will be returned. and the caller should procede<a name="line.673"></a>
+<span class="sourceLineNo">674</span> * and submit the procedure.<a name="line.674"></a>
+<span class="sourceLineNo">675</span> *<a name="line.675"></a>
+<span class="sourceLineNo">676</span> * @param nonceKey A unique identifier for this operation from the client or process.<a name="line.676"></a>
+<span class="sourceLineNo">677</span> * @return the procId associated with the nonce, if any otherwise an invalid procId.<a name="line.677"></a>
+<span class="sourceLineNo">678</span> */<a name="line.678"></a>
+<span class="sourceLineNo">679</span> public long registerNonce(final NonceKey nonceKey) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span> if (nonceKey == null) return -1;<a name="line.680"></a>
+<span class="sourceLineNo">681</span><a name="line.681"></a>
+<span class="sourceLineNo">682</span> // check if we have already a Reserved ID for the nonce<a name="line.682"></a>
+<span class="sourceLineNo">683</span> Long oldProcId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.683"></a>
+<span class="sourceLineNo">684</span> if (oldProcId == null) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> // reserve a new Procedure ID, this will be associated with the nonce<a name="line.685"></a>
+<span class="sourceLineNo">686</span> // and the procedure submitted with the specified nonce will use this ID.<a name="line.686"></a>
+<span class="sourceLineNo">687</span> final long newProcId = nextProcId();<a name="line.687"></a>
+<span class="sourceLineNo">688</span> oldProcId = nonceKeysToProcIdsMap.putIfAbsent(nonceKey, newProcId);<a name="line.688"></a>
+<span class="sourceLineNo">689</span> if (oldProcId == null) return -1;<a name="line.689"></a>
+<span class="sourceLineNo">690</span> }<a name="line.690"></a>
+<span class="sourceLineNo">691</span><a name="line.691"></a>
+<span class="sourceLineNo">692</span> // we found a registered nonce, but the procedure may not have been submitted yet.<a name="line.692"></a>
+<span class="sourceLineNo">693</span> // since the client expect the procedure to be submitted, spin here until it is.<a name="line.693"></a>
+<span class="sourceLineNo">694</span> final boolean traceEnabled = LOG.isTraceEnabled();<a name="line.694"></a>
+<span class="sourceLineNo">695</span> while (isRunning() &&<a name="line.695"></a>
+<span class="sourceLineNo">696</span> !(procedures.containsKey(oldProcId) || completed.containsKey(oldProcId)) &&<a name="line.696"></a>
+<span class="sourceLineNo">697</span> nonceKeysToProcIdsMap.containsKey(nonceKey)) {<a name="line.697"></a>
+<span class="sourceLineNo">698</span> if (traceEnabled) {<a name="line.698"></a>
+<span class="sourceLineNo">699</span> LOG.trace("Waiting for procId=" + oldProcId.longValue() + " to be submitted");<a name="line.699"></a>
+<span class="sourceLineNo">700</span> }<a name="line.700"></a>
+<span class="sourceLineNo">701</span> Threads.sleep(100);<a name="line.701"></a>
+<span class="sourceLineNo">702</span> }<a name="line.702"></a>
+<span class="sourceLineNo">703</span> return oldProcId.longValue();<a name="line.703"></a>
+<span class="sourceLineNo">704</span> }<a name="line.704"></a>
+<span class="sourceLineNo">705</span><a name="line.705"></a>
+<span class="sourceLineNo">706</span> /**<a name="line.706"></a>
+<span class="sourceLineNo">707</span> * Remove the NonceKey if the procedure was not submitted to the executor.<a name="line.707"></a>
+<span class="sourceLineNo">708</span> * @param nonceKey A unique identifier for this operation from the client or process.<a name="line.708"></a>
+<span class="sourceLineNo">709</span> */<a name="line.709"></a>
+<span class="sourceLineNo">710</span> public void unregisterNonceIfProcedureWasNotSubmitted(final NonceKey nonceKey) {<a name="line.710"></a>
+<span class="sourceLineNo">711</span> if (nonceKey == null) return;<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span> final Long procId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (procId == null) return;<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span> // if the procedure was not submitted, remove the nonce<a name="line.716"></a>
+<span class="sourceLineNo">717</span> if (!(procedures.containsKey(procId) || completed.containsKey(procId))) {<a name="line.717"></a>
+<span class="sourceLineNo">718</span> nonceKeysToProcIdsMap.remove(nonceKey);<a name="line.718"></a>
+<span class="sourceLineNo">719</span> }<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span> /**<a name="line.722"></a>
+<span class="sourceLineNo">723</span> * If the failure failed before submitting it, we may want to give back the<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * same error to the requests with the same nonceKey.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> *<a name="line.725"></a>
+<span class="sourceLineNo">726</span> * @param nonceKey A unique identifier for this operation from the client or process<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * @param procName name of the procedure, used to inform the user<a name="line.727"></a>
+<span class="sourceLineNo">728</span> * @param procOwner name of the owner of the procedure, used to inform the user<a name="line.728"></a>
+<span class="sourceLineNo">729</span> * @param exception the failure to report to the user<a name="line.729"></a>
+<span class="sourceLineNo">730</span> */<a name="line.730"></a>
+<span class="sourceLineNo">731</span> public void setFailureResultForNonce(final NonceKey nonceKey, final String procName,<a name="line.731"></a>
+<span class="sourceLineNo">732</span> final User procOwner, final IOException exception) {<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (nonceKey == null) return;<a name="line.733"></a>
+<span class="sourceLineNo">734</span><a name="line.734"></a>
+<span class="sourceLineNo">735</span> final Long procId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> if (procId == null || completed.containsKey(procId)) return;<a name="line.736"></a>
+<span class="sourceLineNo">737</span><a name="line.737"></a>
+<span class="sourceLineNo">738</span> final long currentTime = EnvironmentEdgeManager.currentTime();<a name="line.738"></a>
+<span class="sourceLineNo">739</span> final ProcedureInfo result = new ProcedureInfo(procId.longValue(),<a name="line.739"></a>
+<span class="sourceLineNo">740</span> procName, procOwner != null ? procOwner.getShortName() : null,<a name="line.740"></a>
+<span class="sourceLineNo">741</span> ProcedureUtil.convertToProcedureState(ProcedureState.ROLLEDBACK),<a name="line.741"></a>
+<span class="sourceLineNo">742</span> -1, nonceKey, exception, currentTime, currentTime, null);<a name="line.742"></a>
+<span class="sourceLineNo">743</span> completed.putIfAbsent(procId, result);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span><a name="line.745"></a>
+<span class="sourceLineNo">746</span> // ==========================================================================<a name="line.746"></a>
+<span class="sourceLineNo">747</span> // Submit/Abort Procedure<a name="line.747"></a>
<span class="sourceLineNo">748</span> // ==========================================================================<a name="line.748"></a>
-<span class="sourceLineNo">749</span> // Submit/Abort Procedure<a name="line.749"></a>
-<span class="sourceLineNo">750</span> // ==========================================================================<a name="line.750"></a>
-<span class="sourceLineNo">751</span> /**<a name="line.751"></a>
-<span class="sourceLineNo">752</span> * Add a new root-procedure to the executor.<a name="line.752"></a>
-<span class="sourceLineNo">753</span> * @param proc the new procedure to execute.<a name="line.753"></a>
-<span class="sourceLineNo">754</span> * @return the procedure id, that can be used to monitor the operation<a name="line.754"></a>
-<span class="sourceLineNo">755</span> */<a name="line.755"></a>
-<span class="sourceLineNo">756</span> public long submitProcedure(final Procedure proc) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return submitProcedure(proc, null);<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> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Add a new root-procedure to the executor.<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * @param proc the new procedure to execute.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @param nonceKey the registered unique identifier for this operation from the client or process.<a name="line.763"></a>
-<span class="sourceLineNo">764</span> * @return the procedure id, that can be used to monitor the operation<a name="line.764"></a>
-<span class="sourceLineNo">765</span> */<a name="line.765"></a>
-<span class="sourceLineNo">766</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_NULL_ON_SOME_PATH",<a name="line.766"></a>
-<span class="sourceLineNo">767</span> justification = "FindBugs is blind to the check-for-null")<a name="line.767"></a>
-<span class="sourceLineNo">768</span> public long submitProcedure(final Procedure proc, final NonceKey nonceKey) {<a name="line.768"></a>
-<span class="sourceLineNo">769</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.770"></a>
+<span class="sourceLineNo">749</span> /**<a name="line.749"></a>
+<span class="sourceLineNo">750</span> * Add a new root-procedure to the executor.<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * @param proc the new procedure to execute.<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * @return the procedure id, that can be used to monitor the operation<a name="line.752"></a>
+<span class="sourceLineNo">753</span> */<a name="line.753"></a>
+<span class="sourceLineNo">754</span> public long submitProcedure(final Procedure proc) {<a name="line.754"></a>
+<span class="sourceLineNo">755</span> return submitProcedure(proc, null);<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<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> * Add a new root-procedure to the executor.<a name="line.759"></a>
+<span class="sourceLineNo">760</span> * @param proc the new procedure to execute.<a name="line.760"></a>
+<span class="sourceLineNo">761</span> * @param nonceKey the registered unique identifier for this operation from the client or process.<a name="line.761"></a>
+<span class="sourceLineNo">762</span> * @return the procedure id, that can be used to monitor the operation<a name="line.762"></a>
+<span class="sourceLineNo">763</span> */<a name="line.763"></a>
+<span class="sourceLineNo">764</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_NULL_ON_SOME_PATH",<a name="line.764"></a>
+<span class="sourceLineNo">765</span> justification = "FindBugs is blind to the check-for-null")<a name="line.765"></a>
+<span class="sourceLineNo">766</span> public long submitProcedure(final Procedure proc, final NonceKey nonceKey) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.767"></a>
+<span class="sourceLineNo">768</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.768"></a>
+<span class="sourceLineNo">769</span><a name="line.769"></a>
+<span class="sourceLineNo">770</span> prepareProcedure(proc);<a name="line.770"></a>
<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> prepareProcedure(proc);<a name="line.772"></a>
-<span class="sourceLineNo">773</span><a name="line.773"></a>
-<span class="sourceLineNo">774</span> final Long currentProcId;<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (nonceKey != null) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> currentProcId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> Preconditions.checkArgument(currentProcId != null,<a name="line.777"></a>
-<span class="sourceLineNo">778</span> "Expected nonceKey=" + nonceKey + " to be reserved, use registerNonce(); proc=" + proc);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> } else {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> currentProcId = nextProcId();<a name="line.780"></a>
-<span class="sourceLineNo">781</span> }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span> // Initialize the procedure<a name="line.783"></a>
-<span class="sourceLineNo">784</span> proc.setNonceKey(nonceKey);<a name="line.784"></a>
-<span class="sourceLineNo">785</span> proc.setProcId(currentProcId.longValue());<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> // Commit the transaction<a name="line.787"></a>
-<span class="sourceLineNo">788</span> store.insert(proc, null);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> if (LOG.isDebugEnabled()) {<a name="line.789"></a>
-<span class="sourceLineNo">790</span> LOG.debug("Stored " + proc);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span><a name="line.792"></a>
-<span class="sourceLineNo">793</span> // Add the procedure to the executor<a name="line.793"></a>
-<span class="sourceLineNo">794</span> return pushProcedure(proc);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<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> * Add a set of new root-procedure to the executor.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * @param procs the new procedures to execute.<a name="line.799"></a>
-<span class="sourceLineNo">800</span> */<a name="line.800"></a>
-<span class="sourceLineNo">801</span> // TODO: Do we need to take nonces here?<a name="line.801"></a>
-<span class="sourceLineNo">802</span> public void submitProcedures(final Procedure[] procs) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.803"></a>
-<span class="sourceLineNo">804</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.804"></a>
-<span class="sourceLineNo">805</span><a name="line.805"></a>
-<span class="sourceLineNo">806</span> // Prepare procedure<a name="line.806"></a>
-<span class="sourceLineNo">807</span> for (int i = 0; i < procs.length; ++i) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span> prepareProcedure(procs[i]).setProcId(nextProcId());<a name="line.808"></a>
-<span class="sourceLineNo">809</span> }<a name="line.809"></a>
-<span class="sourceLineNo">810</span><a name="line.810"></a>
-<span class="sourceLineNo">811</span> // Commit the transaction<a name="line.811"></a>
-<span class="sourceLineNo">812</span> store.insert(procs);<a name="line.812"></a>
-<span class="sourceLineNo">813</span> if (LOG.isDebugEnabled()) {<a name="line.813"></a>
-<span class="sourceLineNo">814</span> LOG.debug("Stored " + Arrays.toString(procs));<a name="line.814"></a>
-<span class="sourceLineNo">815</span> }<a name="line.815"></a>
-<span class="sourceLineNo">816</span><a name="line.816"></a>
-<span class="sourceLineNo">817</span> // Add the procedure to the executor<a name="line.817"></a>
-<span class="sourceLineNo">818</span> for (int i = 0; i < procs.length; ++i) {<a name="line.818"></a>
-<span class="sourceLineNo">819</span> pushProcedure(procs[i]);<a name="line.819"></a>
-<span class="sourceLineNo">820</span> }<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span><a name="line.822"></a>
-<span class="sourceLineNo">823</span> private Procedure prepareProcedure(final Procedure proc) {<a name="line.823"></a>
-<span class="sourceLineNo">824</span> Preconditions.checkArgument(proc.getState() == ProcedureState.INITIALIZING);<a name="line.824"></a>
-<span class="sourceLineNo">825</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.825"></a>
-<span class="sourceLineNo">826</span> Preconditions.checkArgument(!proc.hasParent(), "unexpected parent", proc);<a name="line.826"></a>
-<span class="sourceLineNo">827</span> if (this.checkOwnerSet) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> Preconditions.checkArgument(proc.hasOwner(), "missing owner");<a name="line.828"></a>
-<span class="sourceLineNo">829</span> }<a name="line.829"></a>
-<span class="sourceLineNo">830</span> return proc;<a name="line.830"></a>
-<span class="sourceLineNo">831</span> }<a name="line.831"></a>
-<span class="sourceLineNo">832</span><a name="line.832"></a>
-<span class="sourceLineNo">833</span> private long pushProcedure(final Procedure proc) {<a name="line.833"></a>
-<span class="sourceLineNo">834</span> final long currentProcId = proc.getProcId();<a name="line.834"></a>
-<span class="sourceLineNo">835</span><a name="line.835"></a>
-<span class="sourceLineNo">836</span> // Create the rollback stack for the procedure<a name="line.836"></a>
-<span class="sourceLineNo">837</span> RootProcedureState stack = new RootProcedureState();<a name="line.837"></a>
-<span class="sourceLineNo">838</span> rollbackStack.put(currentProcId, stack);<a name="line.838"></a>
-<span class="sourceLineNo">839</span><a name="line.839"></a>
-<span class="sourceLineNo">840</span> // Submit the new subprocedures<a name="line.840"></a>
-<span class="sourceLineNo">841</span> assert !procedures.containsKey(currentProcId);<a name="line.841"></a>
-<span class="sourceLineNo">842</span> procedures.put(currentProcId, proc);<a name="line.842"></a>
-<span class="sourceLineNo">843</span> sendProcedureAddedNotification(currentProcId);<a name="line.843"></a>
-<span class="sourceLineNo">844</span> scheduler.addBack(proc);<a name="line.844"></a>
-<span class="sourceLineNo">845</span> return proc.getProcId();<a name="line.845"></a>
-<span class="sourceLineNo">846</span> }<a name="line.846"></a>
-<span class="sourceLineNo">847</span><a name="line.847"></a>
-<span class="sourceLineNo">848</span> /**<a name="line.848"></a>
-<span class="sourceLineNo">849</span> * Send an abort notification the specified procedure.<a name="line.849"></a>
-<span class="sourceLineNo">850</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.850"></a>
-<span class="sourceLineNo">851</span> * @param procId the procedure to abort<a name="line.851"></a>
-<span class="sourceLineNo">852</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.852"></a>
-<span class="sourceLineNo">853</span> */<a name="line.853"></a>
-<span class="sourceLineNo">854</span> public boolean abort(final long procId) {<a name="line.854"></a>
-<span class="sourceLineNo">855</span> return abort(procId, true);<a name="line.855"></a>
-<span class="sourceLineNo">856</span> }<a name="line.856"></a>
-<span class="sourceLineNo">857</span><a name="line.857"></a>
-<span class="sourceLineNo">858</span> /**<a name="line.858"></a>
-<span class="sourceLineNo">859</span> * Send an abort notification the specified procedure.<a name="line.859"></a>
-<span class="sourceLineNo">860</span> * Depending on the procedure implementation the abort can be considered or ignored.<a name="line.860"></a>
-<span class="sourceLineNo">861</span> * @param procId the procedure to abort<a name="line.861"></a>
-<span class="sourceLineNo">862</span> * @param mayInterruptIfRunning if the proc completed at least one step, should it be aborted?<a name="line.862"></a>
-<span class="sourceLineNo">863</span> * @return true if the procedure exist and has received the abort, otherwise false.<a name="line.863"></a>
-<span class="sourceLineNo">864</span> */<a name="line.864"></a>
-<span class="sourceLineNo">865</span> public boolean abort(final long procId, final boolean mayInterruptIfRunning) {<a name="line.865"></a>
-<span class="sourceLineNo">866</span> final Procedure proc = procedures.get(procId);<a name="line.866"></a>
-<span class="sourceLineNo">867</span> if (proc != null) {<a name="line.867"></a>
-<span class="sourceLineNo">868</span> if (!mayInterruptIfRunning && proc.wasExecuted()) {<a name="line.868"></a>
-<span class="sourceLineNo">869</span> return false;<a name="line.869"></a>
-<span class="sourceLineNo">870</span> }<a name="line.870"></a>
-<span class="sourceLineNo">871</span> return proc.abort(getEnvironment());<a name="line.871"></a>
-<span class="sourceLineNo">872</span> }<a name="line.872"></a>
-<span class="sourceLineNo">873</span> return false;<a name="line.873"></a>
-<span class="sourceLineNo">874</span> }<a name="line.874"></a>
-<span class="sourceLineNo">875</span><a name="line.875"></a>
+<span class="sourceLineNo">772</span> final Long currentProcId;<a name="line.772"></a>
+<span class="sourceLineNo">773</span> if (nonceKey != null) {<a name="line.773"></a>
+<span class="sourceLineNo">774</span> currentProcId = nonceKeysToProcIdsMap.get(nonceKey);<a name="line.774"></a>
+<span class="sourceLineNo">775</span> Preconditions.checkArgument(currentProcId != null,<a name="line.775"></a>
+<span class="sourceLineNo">776</span> "Expected nonceKey=" + nonceKey + " to be reserved, use registerNonce(); proc=" + proc);<a name="line.776"></a>
+<span class="sourceLineNo">777</span> } else {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> currentProcId = nextProcId();<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> // Initialize the procedure<a name="line.781"></a>
+<span class="sourceLineNo">782</span> proc.setNonceKey(nonceKey);<a name="line.782"></a>
+<span class="sourceLineNo">783</span> proc.setProcId(currentProcId.longValue());<a name="line.783"></a>
+<span class="sourceLineNo">784</span><a name="line.784"></a>
+<span class="sourceLineNo">785</span> // Commit the transaction<a name="line.785"></a>
+<span class="sourceLineNo">786</span> store.insert(proc, null);<a name="line.786"></a>
+<span class="sourceLineNo">787</span> if (LOG.isDebugEnabled()) {<a name="line.787"></a>
+<span class="sourceLineNo">788</span> LOG.debug("Stored " + proc);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> }<a name="line.789"></a>
+<span class="sourceLineNo">790</span><a name="line.790"></a>
+<span class="sourceLineNo">791</span> // Add the procedure to the executor<a name="line.791"></a>
+<span class="sourceLineNo">792</span> return pushProcedure(proc);<a name="line.792"></a>
+<span class="sourceLineNo">793</span> }<a name="line.793"></a>
+<span class="sourceLineNo">794</span><a name="line.794"></a>
+<span class="sourceLineNo">795</span> /**<a name="line.795"></a>
+<span class="sourceLineNo">796</span> * Add a set of new root-procedure to the executor.<a name="line.796"></a>
+<span class="sourceLineNo">797</span> * @param procs the new procedures to execute.<a name="line.797"></a>
+<span class="sourceLineNo">798</span> */<a name="line.798"></a>
+<span class="sourceLineNo">799</span> // TODO: Do we need to take nonces here?<a name="line.799"></a>
+<span class="sourceLineNo">800</span> public void submitProcedures(final Procedure[] procs) {<a name="line.800"></a>
+<span class="sourceLineNo">801</span> Preconditions.checkArgument(lastProcId.get() >= 0);<a name="line.801"></a>
+<span class="sourceLineNo">802</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span> // Prepare procedure<a name="line.804"></a>
+<span class="sourceLineNo">805</span> for (int i = 0; i < procs.length; ++i) {<a name="line.805"></a>
+<span class="sourceLineNo">806</span> prepareProcedure(procs[i]).setProcId(nextProcId());<a name="line.806"></a>
+<span class="sourceLineNo">807</span> }<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span> // Commit the transaction<a name="line.809"></a>
+<span class="sourceLineNo">810</span> store.insert(procs);<a name="line.810"></a>
+<span class="sourceLineNo">811</span> if (LOG.isDebugEnabled()) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span> LOG.debug("Stored " + Arrays.toString(procs));<a name="line.812"></a>
+<span class="sourceLineNo">813</span> }<a name="line.813"></a>
+<span class="sourceLineNo">814</span><a name="line.814"></a>
+<span class="sourceLineNo">815</span> // Add the procedure to the executor<a name="line.815"></a>
+<span class="sourceLineNo">816</span> for (int i = 0; i < procs.length; ++i) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span> pushProcedure(procs[i]);<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> }<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span> private Procedure prepareProcedure(final Procedure proc) {<a name="line.821"></a>
+<span class="sourceLineNo">822</span> Preconditions.checkArgument(proc.getState() == ProcedureState.INITIALIZING);<a name="line.822"></a>
+<span class="sourceLineNo">823</span> Preconditions.checkArgument(isRunning(), "executor not running");<a name="line.823"></a>
+<span class="sourceLineNo">824</span> Preconditions.checkArgument(!proc.hasParent(), "unexpected parent", proc);<a name="line.824"></a>
+<span class="sourceLineNo">825</span> if (this.checkOwnerSet) {<a name="line.825"></a>
+<span class="sourceLineNo">826</span> Preconditions.checkArgument(proc.hasOwner(), "missing owner");<a name="line.826"></a>
+<span class="sourceLineNo">827</span> }<a name="line.827"></a>
+<span class="sourceLineNo">828</span> return proc;<a name="line.828"></a>
+<span class="sourceLineNo">829</span> }<a name="line.829"></a>
+<span class="sourceLineNo">830</span><a name="line.830"></a>
+<span class="sourceLineNo">831</span> private long pushProcedure(final Procedure proc) {<a name="line.831"></a>
+<span class="sourceLineNo">832</span> final long currentProcId = proc.getProcId();<a name="line.832"></a>
+<span class="sourceLineNo">833</span><a name="line.833"></a>
+<span class="sourceLineNo">834</span> // Create the rollback stack for the procedure<a name="line.834"></a>
+<span class="sourceLineNo">835</span> RootProcedureState stack = new RootProcedureState();<a name="line.835"></a>
+<span class="sourceLineNo">836</span> rollbackStack.put(currentProcId, stack);<a name="line.836"></a>
+<span class="sourceLineNo">837</span><a name="line.837"></a>
+<span class="sourceLineNo">838</span> // Submit the new subprocedures<a name="line.838"></a>
+<span class="sourceLineNo">839</span> assert !procedures.containsKey(currentProcId);<a name="line.839"></a>
+<span class="sourceLineNo">840
<TRUNCATED>