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 2018/10/24 14:54:37 UTC
[03/51] [partial] hbase-site git commit: Published site at
3fe8649b2c9ba1271c25e8f476548907e4c7a90d.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8f09a71d/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.Iter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.Iter.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.Iter.html
index 8ef0ff5..9545561 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.Iter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.Iter.html
@@ -153,158 +153,161 @@
<span class="sourceLineNo">145</span><a name="line.145"></a>
<span class="sourceLineNo">146</span> private void collectStackId(Entry entry, Map<Integer, List<Entry>> stackId2Proc,<a name="line.146"></a>
<span class="sourceLineNo">147</span> MutableInt maxStackId) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> int stackId = entry.proc.getStackId(i);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (stackId > maxStackId.intValue()) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> maxStackId.setValue(stackId);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Map<Long, Entry> remainingProcMap) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.160"></a>
-<span class="sourceLineNo">161</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> for (Entry e : entry.subProcs) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.169"></a>
-<span class="sourceLineNo">170</span> for (Entry e : entry.subProcs) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.177"></a>
-<span class="sourceLineNo">178</span> // orphan procedures.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (isFinished(rootEntry.proc)) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.183"></a>
-<span class="sourceLineNo">184</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> } else {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // the stack ids should start from 0 and increase by one every time<a name="line.193"></a>
-<span class="sourceLineNo">194</span> boolean valid = true;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (entries == null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rootEntry);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> valid = false;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } else if (entries.size() > 1) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.202"></a>
-<span class="sourceLineNo">203</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> valid = false;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (valid) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> } else {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> procMap.values().forEach(entry -> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> LOG.error("Orphan procedure: {}", entry);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.217"></a>
-<span class="sourceLineNo">218</span> });<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> private static final class Iter implements ProcedureIterator {<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private final List<ProtoAndProc> procs;<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> private Iterator<ProtoAndProc> iter;<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private ProtoAndProc current;<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public Iter(List<ProtoAndProc> procs) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> this.procs = procs;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> reset();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public void reset() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> iter = procs.iterator();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (iter.hasNext()) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> current = iter.next();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> } else {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> current = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public boolean hasNext() {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return current != null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> private void checkNext() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (!hasNext()) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> throw new NoSuchElementException();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public boolean isNextFinished() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> checkNext();<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return isFinished(current.proto);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> private void moveToNext() {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (iter.hasNext()) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> current = iter.next();<a name="line.263"></a>
-<span class="sourceLineNo">264</span> } else {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> current = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public void skipNext() {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> checkNext();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> moveToNext();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public Procedure<?> next() throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> checkNext();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> Procedure<?> proc = current.getProc();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> moveToNext();<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return proc;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> public ProcedureIterator getValidProcs() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> return new Iter(validProcs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> public ProcedureIterator getCorruptedProcs() {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return new Iter(corruptedProcs);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.293"></a>
-<span class="sourceLineNo">294</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return new WALProcedureTree(procMap);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>}<a name="line.299"></a>
+<span class="sourceLineNo">148</span> if (LOG.isDebugEnabled()) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> LOG.debug("Procedure {} stack ids={}", entry, entry.proc.getStackIdList());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> int stackId = entry.proc.getStackId(i);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (stackId > maxStackId.intValue()) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> maxStackId.setValue(stackId);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Map<Long, Entry> remainingProcMap) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.163"></a>
+<span class="sourceLineNo">164</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> for (Entry e : entry.subProcs) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (Entry e : entry.subProcs) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // orphan procedures.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (isFinished(rootEntry.proc)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.186"></a>
+<span class="sourceLineNo">187</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // the stack ids should start from 0 and increase by one every time<a name="line.196"></a>
+<span class="sourceLineNo">197</span> boolean valid = true;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (entries == null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.201"></a>
+<span class="sourceLineNo">202</span> rootEntry);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> valid = false;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> } else if (entries.size() > 1) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.205"></a>
+<span class="sourceLineNo">206</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> valid = false;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (valid) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> } else {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> procMap.values().forEach(entry -> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.error("Orphan procedure: {}", entry);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> });<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> private static final class Iter implements ProcedureIterator {<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> private final List<ProtoAndProc> procs;<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> private Iterator<ProtoAndProc> iter;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> private ProtoAndProc current;<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> public Iter(List<ProtoAndProc> procs) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> this.procs = procs;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> reset();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> @Override<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public void reset() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> iter = procs.iterator();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (iter.hasNext()) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> current = iter.next();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> current = null;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public boolean hasNext() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return current != null;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> private void checkNext() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (!hasNext()) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> throw new NoSuchElementException();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean isNextFinished() {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> checkNext();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return isFinished(current.proto);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> private void moveToNext() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (iter.hasNext()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> current = iter.next();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> current = null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public void skipNext() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> checkNext();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> moveToNext();<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> @Override<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public Procedure<?> next() throws IOException {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> checkNext();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Procedure<?> proc = current.getProc();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> moveToNext();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return proc;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> public ProcedureIterator getValidProcs() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return new Iter(validProcs);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> public ProcedureIterator getCorruptedProcs() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return new Iter(corruptedProcs);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return new WALProcedureTree(procMap);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>}<a name="line.302"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8f09a71d/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.ProtoAndProc.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.ProtoAndProc.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.ProtoAndProc.html
index 8ef0ff5..9545561 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.ProtoAndProc.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.ProtoAndProc.html
@@ -153,158 +153,161 @@
<span class="sourceLineNo">145</span><a name="line.145"></a>
<span class="sourceLineNo">146</span> private void collectStackId(Entry entry, Map<Integer, List<Entry>> stackId2Proc,<a name="line.146"></a>
<span class="sourceLineNo">147</span> MutableInt maxStackId) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> int stackId = entry.proc.getStackId(i);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (stackId > maxStackId.intValue()) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> maxStackId.setValue(stackId);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Map<Long, Entry> remainingProcMap) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.160"></a>
-<span class="sourceLineNo">161</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> for (Entry e : entry.subProcs) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.169"></a>
-<span class="sourceLineNo">170</span> for (Entry e : entry.subProcs) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.177"></a>
-<span class="sourceLineNo">178</span> // orphan procedures.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (isFinished(rootEntry.proc)) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.183"></a>
-<span class="sourceLineNo">184</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> } else {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // the stack ids should start from 0 and increase by one every time<a name="line.193"></a>
-<span class="sourceLineNo">194</span> boolean valid = true;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (entries == null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rootEntry);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> valid = false;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } else if (entries.size() > 1) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.202"></a>
-<span class="sourceLineNo">203</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> valid = false;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (valid) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> } else {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> procMap.values().forEach(entry -> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> LOG.error("Orphan procedure: {}", entry);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.217"></a>
-<span class="sourceLineNo">218</span> });<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> private static final class Iter implements ProcedureIterator {<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private final List<ProtoAndProc> procs;<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> private Iterator<ProtoAndProc> iter;<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private ProtoAndProc current;<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public Iter(List<ProtoAndProc> procs) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> this.procs = procs;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> reset();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public void reset() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> iter = procs.iterator();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (iter.hasNext()) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> current = iter.next();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> } else {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> current = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public boolean hasNext() {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return current != null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> private void checkNext() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (!hasNext()) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> throw new NoSuchElementException();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public boolean isNextFinished() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> checkNext();<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return isFinished(current.proto);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> private void moveToNext() {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (iter.hasNext()) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> current = iter.next();<a name="line.263"></a>
-<span class="sourceLineNo">264</span> } else {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> current = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public void skipNext() {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> checkNext();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> moveToNext();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public Procedure<?> next() throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> checkNext();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> Procedure<?> proc = current.getProc();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> moveToNext();<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return proc;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> public ProcedureIterator getValidProcs() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> return new Iter(validProcs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> public ProcedureIterator getCorruptedProcs() {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return new Iter(corruptedProcs);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.293"></a>
-<span class="sourceLineNo">294</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return new WALProcedureTree(procMap);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>}<a name="line.299"></a>
+<span class="sourceLineNo">148</span> if (LOG.isDebugEnabled()) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> LOG.debug("Procedure {} stack ids={}", entry, entry.proc.getStackIdList());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> int stackId = entry.proc.getStackId(i);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (stackId > maxStackId.intValue()) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> maxStackId.setValue(stackId);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Map<Long, Entry> remainingProcMap) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.163"></a>
+<span class="sourceLineNo">164</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> for (Entry e : entry.subProcs) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (Entry e : entry.subProcs) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // orphan procedures.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (isFinished(rootEntry.proc)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.186"></a>
+<span class="sourceLineNo">187</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // the stack ids should start from 0 and increase by one every time<a name="line.196"></a>
+<span class="sourceLineNo">197</span> boolean valid = true;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (entries == null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.201"></a>
+<span class="sourceLineNo">202</span> rootEntry);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> valid = false;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> } else if (entries.size() > 1) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.205"></a>
+<span class="sourceLineNo">206</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> valid = false;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (valid) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> } else {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> procMap.values().forEach(entry -> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.error("Orphan procedure: {}", entry);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> });<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> private static final class Iter implements ProcedureIterator {<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> private final List<ProtoAndProc> procs;<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> private Iterator<ProtoAndProc> iter;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> private ProtoAndProc current;<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> public Iter(List<ProtoAndProc> procs) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> this.procs = procs;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> reset();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> @Override<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public void reset() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> iter = procs.iterator();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (iter.hasNext()) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> current = iter.next();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> current = null;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public boolean hasNext() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return current != null;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> private void checkNext() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (!hasNext()) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> throw new NoSuchElementException();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean isNextFinished() {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> checkNext();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return isFinished(current.proto);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> private void moveToNext() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (iter.hasNext()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> current = iter.next();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> current = null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public void skipNext() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> checkNext();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> moveToNext();<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> @Override<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public Procedure<?> next() throws IOException {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> checkNext();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Procedure<?> proc = current.getProc();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> moveToNext();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return proc;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> public ProcedureIterator getValidProcs() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return new Iter(validProcs);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> public ProcedureIterator getCorruptedProcs() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return new Iter(corruptedProcs);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return new WALProcedureTree(procMap);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>}<a name="line.302"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8f09a71d/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.html
index 8ef0ff5..9545561 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureTree.html
@@ -153,158 +153,161 @@
<span class="sourceLineNo">145</span><a name="line.145"></a>
<span class="sourceLineNo">146</span> private void collectStackId(Entry entry, Map<Integer, List<Entry>> stackId2Proc,<a name="line.146"></a>
<span class="sourceLineNo">147</span> MutableInt maxStackId) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> int stackId = entry.proc.getStackId(i);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (stackId > maxStackId.intValue()) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> maxStackId.setValue(stackId);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Map<Long, Entry> remainingProcMap) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.160"></a>
-<span class="sourceLineNo">161</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> for (Entry e : entry.subProcs) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.169"></a>
-<span class="sourceLineNo">170</span> for (Entry e : entry.subProcs) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.177"></a>
-<span class="sourceLineNo">178</span> // orphan procedures.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (isFinished(rootEntry.proc)) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.183"></a>
-<span class="sourceLineNo">184</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> } else {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // the stack ids should start from 0 and increase by one every time<a name="line.193"></a>
-<span class="sourceLineNo">194</span> boolean valid = true;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (entries == null) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rootEntry);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> valid = false;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } else if (entries.size() > 1) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.202"></a>
-<span class="sourceLineNo">203</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> valid = false;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (valid) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> } else {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> procMap.values().forEach(entry -> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> LOG.error("Orphan procedure: {}", entry);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.217"></a>
-<span class="sourceLineNo">218</span> });<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> private static final class Iter implements ProcedureIterator {<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private final List<ProtoAndProc> procs;<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> private Iterator<ProtoAndProc> iter;<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> private ProtoAndProc current;<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public Iter(List<ProtoAndProc> procs) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> this.procs = procs;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> reset();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public void reset() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> iter = procs.iterator();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (iter.hasNext()) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> current = iter.next();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> } else {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> current = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> @Override<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public boolean hasNext() {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return current != null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> private void checkNext() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (!hasNext()) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> throw new NoSuchElementException();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public boolean isNextFinished() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> checkNext();<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return isFinished(current.proto);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> private void moveToNext() {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (iter.hasNext()) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> current = iter.next();<a name="line.263"></a>
-<span class="sourceLineNo">264</span> } else {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> current = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public void skipNext() {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> checkNext();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> moveToNext();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public Procedure<?> next() throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> checkNext();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> Procedure<?> proc = current.getProc();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> moveToNext();<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return proc;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> public ProcedureIterator getValidProcs() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> return new Iter(validProcs);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> public ProcedureIterator getCorruptedProcs() {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return new Iter(corruptedProcs);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.293"></a>
-<span class="sourceLineNo">294</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return new WALProcedureTree(procMap);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>}<a name="line.299"></a>
+<span class="sourceLineNo">148</span> if (LOG.isDebugEnabled()) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> LOG.debug("Procedure {} stack ids={}", entry, entry.proc.getStackIdList());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (int i = 0, n = entry.proc.getStackIdCount(); i < n; i++) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> int stackId = entry.proc.getStackId(i);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (stackId > maxStackId.intValue()) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> maxStackId.setValue(stackId);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> stackId2Proc.computeIfAbsent(stackId, k -> new ArrayList<>()).add(entry);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> entry.subProcs.forEach(e -> collectStackId(e, stackId2Proc, maxStackId));<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> private void addAllToCorruptedAndRemoveFromProcMap(Entry entry,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Map<Long, Entry> remainingProcMap) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.163"></a>
+<span class="sourceLineNo">164</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> for (Entry e : entry.subProcs) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> addAllToCorruptedAndRemoveFromProcMap(e, remainingProcMap);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> private void addAllToValidAndRemoveFromProcMap(Entry entry, Map<Long, Entry> remainingProcMap) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> validProcs.add(new ProtoAndProc(entry.proc));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> remainingProcMap.remove(entry.proc.getProcId());<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (Entry e : entry.subProcs) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> addAllToValidAndRemoveFromProcMap(e, remainingProcMap);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // In this method first we will check whether the given root procedure and all its sub procedures<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // are valid, through the procedure stack. And we will also remove all these procedures from the<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // remainingProcMap, so at last, if there are still procedures in the map, we know that there are<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // orphan procedures.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void checkReady(Entry rootEntry, Map<Long, Entry> remainingProcMap) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (isFinished(rootEntry.proc)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!rootEntry.subProcs.isEmpty()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.error("unexpected active children for root-procedure: {}", rootEntry);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> rootEntry.subProcs.forEach(e -> LOG.error("unexpected active children: {}", e));<a name="line.186"></a>
+<span class="sourceLineNo">187</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> } else {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> Map<Integer, List<Entry>> stackId2Proc = new HashMap<>();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> MutableInt maxStackId = new MutableInt(Integer.MIN_VALUE);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> collectStackId(rootEntry, stackId2Proc, maxStackId);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // the stack ids should start from 0 and increase by one every time<a name="line.196"></a>
+<span class="sourceLineNo">197</span> boolean valid = true;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> for (int i = 0; i <= maxStackId.intValue(); i++) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> List<Entry> entries = stackId2Proc.get(i);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (entries == null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.error("Missing stack id {}, max stack id is {}, root procedure is {}", i, maxStackId,<a name="line.201"></a>
+<span class="sourceLineNo">202</span> rootEntry);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> valid = false;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> } else if (entries.size() > 1) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.error("Multiple procedures {} have the same stack id {}, max stack id is {}," +<a name="line.205"></a>
+<span class="sourceLineNo">206</span> " root procedure is {}", entries, i, maxStackId, rootEntry);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> valid = false;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (valid) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> addAllToValidAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> } else {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> addAllToCorruptedAndRemoveFromProcMap(rootEntry, remainingProcMap);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> private void checkOrphan(Map<Long, Entry> procMap) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> procMap.values().forEach(entry -> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.error("Orphan procedure: {}", entry);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> corruptedProcs.add(new ProtoAndProc(entry.proc));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> });<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> private static final class Iter implements ProcedureIterator {<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> private final List<ProtoAndProc> procs;<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> private Iterator<ProtoAndProc> iter;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> private ProtoAndProc current;<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> public Iter(List<ProtoAndProc> procs) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> this.procs = procs;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> reset();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> @Override<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public void reset() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> iter = procs.iterator();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (iter.hasNext()) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> current = iter.next();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> current = null;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> @Override<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public boolean hasNext() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return current != null;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> private void checkNext() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (!hasNext()) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> throw new NoSuchElementException();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean isNextFinished() {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> checkNext();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return isFinished(current.proto);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> private void moveToNext() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (iter.hasNext()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> current = iter.next();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> current = null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public void skipNext() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> checkNext();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> moveToNext();<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> @Override<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public Procedure<?> next() throws IOException {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> checkNext();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Procedure<?> proc = current.getProc();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> moveToNext();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return proc;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> public ProcedureIterator getValidProcs() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return new Iter(validProcs);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> public ProcedureIterator getCorruptedProcs() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return new Iter(corruptedProcs);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> public static WALProcedureTree build(Collection<ProcedureProtos.Procedure> procedures) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map<Long, Entry> procMap = new HashMap<>();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (ProcedureProtos.Procedure proc : procedures) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> procMap.put(proc.getProcId(), new Entry(proc));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return new WALProcedureTree(procMap);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>}<a name="line.302"></a>