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/10/17 15:16:01 UTC
[27/37] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignProcedure.html
index ac6ffef..7fd9735 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignProcedure.html
@@ -206,166 +206,170 @@
<span class="sourceLineNo">198</span> // Try and keep the location we had before we offlined.<a name="line.198"></a>
<span class="sourceLineNo">199</span> retain = true;<a name="line.199"></a>
<span class="sourceLineNo">200</span> regionNode.setRegionLocation(lastRegionLocation);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> LOG.info("Start " + this + "; " + regionNode.toShortString() +<a name="line.204"></a>
-<span class="sourceLineNo">205</span> "; forceNewPlan=" + this.forceNewPlan +<a name="line.205"></a>
-<span class="sourceLineNo">206</span> ", retain=" + retain);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> env.getAssignmentManager().queueAssign(regionNode);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return true;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
-<span class="sourceLineNo">212</span> protected boolean updateTransition(final MasterProcedureEnv env, final RegionStateNode regionNode)<a name="line.212"></a>
-<span class="sourceLineNo">213</span> throws IOException, ProcedureSuspendedException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> // TODO: crash if destinationServer is specified and not online<a name="line.214"></a>
-<span class="sourceLineNo">215</span> // which is also the case when the balancer provided us with a different location.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (LOG.isTraceEnabled()) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> LOG.trace("Update " + this + "; " + regionNode.toShortString());<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (regionNode.getRegionLocation() == null) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return true;<a name="line.221"></a>
+<span class="sourceLineNo">201</span> } else if (regionNode.getLastHost() != null) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> retain = true;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> LOG.info("Setting lastHost as the region location " + regionNode.getLastHost());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> regionNode.setRegionLocation(regionNode.getLastHost());<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> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> LOG.info("Start " + this + "; " + regionNode.toShortString() +<a name="line.208"></a>
+<span class="sourceLineNo">209</span> "; forceNewPlan=" + this.forceNewPlan +<a name="line.209"></a>
+<span class="sourceLineNo">210</span> ", retain=" + retain);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> env.getAssignmentManager().queueAssign(regionNode);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return true;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
+<span class="sourceLineNo">216</span> protected boolean updateTransition(final MasterProcedureEnv env, final RegionStateNode regionNode)<a name="line.216"></a>
+<span class="sourceLineNo">217</span> throws IOException, ProcedureSuspendedException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> // TODO: crash if destinationServer is specified and not online<a name="line.218"></a>
+<span class="sourceLineNo">219</span> // which is also the case when the balancer provided us with a different location.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (LOG.isTraceEnabled()) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.trace("Update " + this + "; " + regionNode.toShortString());<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> if (!isServerOnline(env, regionNode)) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> // TODO: is this correct? should we wait the chore/ssh?<a name="line.225"></a>
-<span class="sourceLineNo">226</span> LOG.info("Server not online, re-queuing " + this + "; " + regionNode.toShortString());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return true;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> if (env.getAssignmentManager().waitServerReportEvent(regionNode.getRegionLocation(), this)) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.info("Early suspend! " + this + "; " + regionNode.toShortString());<a name="line.232"></a>
-<span class="sourceLineNo">233</span> throw new ProcedureSuspendedException();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (regionNode.isInState(State.OPEN)) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> LOG.info("Already assigned: " + this + "; " + regionNode.toShortString());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return false;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> // Transition regionNode State. Set it to OPENING. Update hbase:meta, and add<a name="line.241"></a>
-<span class="sourceLineNo">242</span> // region to list of regions on the target regionserver. Need to UNDO if failure!<a name="line.242"></a>
-<span class="sourceLineNo">243</span> env.getAssignmentManager().markRegionAsOpening(regionNode);<a name="line.243"></a>
+<span class="sourceLineNo">223</span> if (regionNode.getRegionLocation() == null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return true;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> if (!isServerOnline(env, regionNode)) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // TODO: is this correct? should we wait the chore/ssh?<a name="line.229"></a>
+<span class="sourceLineNo">230</span> LOG.info("Server not online, re-queuing " + this + "; " + regionNode.toShortString());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return true;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> if (env.getAssignmentManager().waitServerReportEvent(regionNode.getRegionLocation(), this)) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> LOG.info("Early suspend! " + this + "; " + regionNode.toShortString());<a name="line.236"></a>
+<span class="sourceLineNo">237</span> throw new ProcedureSuspendedException();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (regionNode.isInState(State.OPEN)) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> LOG.info("Already assigned: " + this + "; " + regionNode.toShortString());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> return false;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> // TODO: Requires a migration to be open by the RS?<a name="line.245"></a>
-<span class="sourceLineNo">246</span> // regionNode.getFormatVersion()<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (!addToRemoteDispatcher(env, regionNode.getRegionLocation())) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // Failed the dispatch BUT addToRemoteDispatcher internally does<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // cleanup on failure -- even the undoing of markRegionAsOpening above --<a name="line.250"></a>
-<span class="sourceLineNo">251</span> // so nothing more to do here; in fact we need to get out of here<a name="line.251"></a>
-<span class="sourceLineNo">252</span> // fast since we've been put back on the scheduler.<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> // We always return true, even if we fail dispatch because addToRemoteDispatcher<a name="line.255"></a>
-<span class="sourceLineNo">256</span> // failure processing sets state back to REGION_TRANSITION_QUEUE so we try again;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> // i.e. return true to keep the Procedure running; it has been reset to startover.<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return true;<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> @Override<a name="line.261"></a>
-<span class="sourceLineNo">262</span> protected void finishTransition(final MasterProcedureEnv env, final RegionStateNode regionNode)<a name="line.262"></a>
-<span class="sourceLineNo">263</span> throws IOException {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> env.getAssignmentManager().markRegionAsOpened(regionNode);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // This success may have been after we failed open a few times. Be sure to cleanup any<a name="line.265"></a>
-<span class="sourceLineNo">266</span> // failed open references. See #incrementAndCheckMaxAttempts and where it is called.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> env.getAssignmentManager().getRegionStates().removeFromFailedOpen(regionNode.getRegionInfo());<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span> protected void reportTransition(final MasterProcedureEnv env, final RegionStateNode regionNode,<a name="line.271"></a>
-<span class="sourceLineNo">272</span> final TransitionCode code, final long openSeqNum) throws UnexpectedStateException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> switch (code) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> case OPENED:<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (openSeqNum < 0) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> throw new UnexpectedStateException("Received report unexpected " + code +<a name="line.276"></a>
-<span class="sourceLineNo">277</span> " transition openSeqNum=" + openSeqNum + ", " + regionNode);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (openSeqNum < regionNode.getOpenSeqNum()) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> LOG.warn("Skipping update of open seqnum with " + openSeqNum +<a name="line.280"></a>
-<span class="sourceLineNo">281</span> " because current seqnum=" + regionNode.getOpenSeqNum());<a name="line.281"></a>
+<span class="sourceLineNo">245</span> // Transition regionNode State. Set it to OPENING. Update hbase:meta, and add<a name="line.245"></a>
+<span class="sourceLineNo">246</span> // region to list of regions on the target regionserver. Need to UNDO if failure!<a name="line.246"></a>
+<span class="sourceLineNo">247</span> env.getAssignmentManager().markRegionAsOpening(regionNode);<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> // TODO: Requires a migration to be open by the RS?<a name="line.249"></a>
+<span class="sourceLineNo">250</span> // regionNode.getFormatVersion()<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (!addToRemoteDispatcher(env, regionNode.getRegionLocation())) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // Failed the dispatch BUT addToRemoteDispatcher internally does<a name="line.253"></a>
+<span class="sourceLineNo">254</span> // cleanup on failure -- even the undoing of markRegionAsOpening above --<a name="line.254"></a>
+<span class="sourceLineNo">255</span> // so nothing more to do here; in fact we need to get out of here<a name="line.255"></a>
+<span class="sourceLineNo">256</span> // fast since we've been put back on the scheduler.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> // We always return true, even if we fail dispatch because addToRemoteDispatcher<a name="line.259"></a>
+<span class="sourceLineNo">260</span> // failure processing sets state back to REGION_TRANSITION_QUEUE so we try again;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> // i.e. return true to keep the Procedure running; it has been reset to startover.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> return true;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
+<span class="sourceLineNo">266</span> protected void finishTransition(final MasterProcedureEnv env, final RegionStateNode regionNode)<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throws IOException {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> env.getAssignmentManager().markRegionAsOpened(regionNode);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> // This success may have been after we failed open a few times. Be sure to cleanup any<a name="line.269"></a>
+<span class="sourceLineNo">270</span> // failed open references. See #incrementAndCheckMaxAttempts and where it is called.<a name="line.270"></a>
+<span class="sourceLineNo">271</span> env.getAssignmentManager().getRegionStates().removeFromFailedOpen(regionNode.getRegionInfo());<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> protected void reportTransition(final MasterProcedureEnv env, final RegionStateNode regionNode,<a name="line.275"></a>
+<span class="sourceLineNo">276</span> final TransitionCode code, final long openSeqNum) throws UnexpectedStateException {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> switch (code) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> case OPENED:<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (openSeqNum < 0) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> throw new UnexpectedStateException("Received report unexpected " + code +<a name="line.280"></a>
+<span class="sourceLineNo">281</span> " transition openSeqNum=" + openSeqNum + ", " + regionNode);<a name="line.281"></a>
<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> regionNode.setOpenSeqNum(openSeqNum);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> // Leave the state here as OPENING for now. We set it to OPEN in<a name="line.284"></a>
-<span class="sourceLineNo">285</span> // REGION_TRANSITION_FINISH section where we do a bunch of checks.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // regionNode.setState(RegionState.State.OPEN, RegionState.State.OPENING);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_FINISH);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> break;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> case FAILED_OPEN:<a name="line.289"></a>
-<span class="sourceLineNo">290</span> handleFailure(env, regionNode);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> break;<a name="line.291"></a>
-<span class="sourceLineNo">292</span> default:<a name="line.292"></a>
-<span class="sourceLineNo">293</span> throw new UnexpectedStateException("Received report unexpected " + code +<a name="line.293"></a>
-<span class="sourceLineNo">294</span> " transition openSeqNum=" + openSeqNum + ", " + regionNode.toShortString() +<a name="line.294"></a>
-<span class="sourceLineNo">295</span> ", " + this + ", expected OPENED or FAILED_OPEN.");<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<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">300</span> * Called when dispatch or subsequent OPEN request fail. Can be run by the<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * inline dispatch call or later by the ServerCrashProcedure. Our state is<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * generally OPENING. Cleanup and reset to OFFLINE and put our Procedure<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * State back to REGION_TRANSITION_QUEUE so the Assign starts over.<a name="line.303"></a>
-<span class="sourceLineNo">304</span> */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> private void handleFailure(final MasterProcedureEnv env, final RegionStateNode regionNode) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> if (incrementAndCheckMaxAttempts(env, regionNode)) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> aborted.set(true);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> this.forceNewPlan = true;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> this.targetServer = null;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> regionNode.offline();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // We were moved to OPENING state before dispatch. Undo. It is safe to call<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // this method because it checks for OPENING first.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> env.getAssignmentManager().undoRegionAsOpening(regionNode);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> private boolean incrementAndCheckMaxAttempts(final MasterProcedureEnv env,<a name="line.318"></a>
-<span class="sourceLineNo">319</span> final RegionStateNode regionNode) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> final int retries = env.getAssignmentManager().getRegionStates().<a name="line.320"></a>
-<span class="sourceLineNo">321</span> addToFailedOpen(regionNode).incrementAndGetRetries();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> int max = env.getAssignmentManager().getAssignMaxAttempts();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> LOG.info("Retry=" + retries + " of max=" + max + "; " +<a name="line.323"></a>
-<span class="sourceLineNo">324</span> this + "; " + regionNode.toShortString());<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return retries >= max;<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> @Override<a name="line.328"></a>
-<span class="sourceLineNo">329</span> public RemoteOperation remoteCallBuild(final MasterProcedureEnv env, final ServerName serverName) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> assert serverName.equals(getRegionState(env).getRegionLocation());<a name="line.330"></a>
-<span class="sourceLineNo">331</span> return new RegionOpenOperation(this, getRegionInfo(),<a name="line.331"></a>
-<span class="sourceLineNo">332</span> env.getAssignmentManager().getFavoredNodes(getRegionInfo()), false);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> @Override<a name="line.335"></a>
-<span class="sourceLineNo">336</span> protected boolean remoteCallFailed(final MasterProcedureEnv env, final RegionStateNode regionNode,<a name="line.336"></a>
-<span class="sourceLineNo">337</span> final IOException exception) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> handleFailure(env, regionNode);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> return true;<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> @Override<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> super.toStringClassDetails(sb);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (this.targetServer != null) sb.append(", target=").append(this.targetServer);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> @Override<a name="line.348"></a>
-<span class="sourceLineNo">349</span> public ServerName getServer(final MasterProcedureEnv env) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> RegionStateNode node =<a name="line.350"></a>
-<span class="sourceLineNo">351</span> env.getAssignmentManager().getRegionStates().getRegionNode(this.getRegionInfo());<a name="line.351"></a>
-<span class="sourceLineNo">352</span> if (node == null) return null;<a name="line.352"></a>
-<span class="sourceLineNo">353</span> return node.getRegionLocation();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> @Override<a name="line.356"></a>
-<span class="sourceLineNo">357</span> protected ProcedureMetrics getProcedureMetrics(MasterProcedureEnv env) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> return env.getAssignmentManager().getAssignmentManagerMetrics().getAssignProcMetrics();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>}<a name="line.360"></a>
+<span class="sourceLineNo">283</span> if (openSeqNum < regionNode.getOpenSeqNum()) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> LOG.warn("Skipping update of open seqnum with " + openSeqNum +<a name="line.284"></a>
+<span class="sourceLineNo">285</span> " because current seqnum=" + regionNode.getOpenSeqNum());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span> regionNode.setOpenSeqNum(openSeqNum);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> // Leave the state here as OPENING for now. We set it to OPEN in<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // REGION_TRANSITION_FINISH section where we do a bunch of checks.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // regionNode.setState(RegionState.State.OPEN, RegionState.State.OPENING);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_FINISH);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> break;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> case FAILED_OPEN:<a name="line.293"></a>
+<span class="sourceLineNo">294</span> handleFailure(env, regionNode);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> break;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> default:<a name="line.296"></a>
+<span class="sourceLineNo">297</span> throw new UnexpectedStateException("Received report unexpected " + code +<a name="line.297"></a>
+<span class="sourceLineNo">298</span> " transition openSeqNum=" + openSeqNum + ", " + regionNode.toShortString() +<a name="line.298"></a>
+<span class="sourceLineNo">299</span> ", " + this + ", expected OPENED or FAILED_OPEN.");<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<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>
+<span class="sourceLineNo">303</span> /**<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * Called when dispatch or subsequent OPEN request fail. Can be run by the<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * inline dispatch call or later by the ServerCrashProcedure. Our state is<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * generally OPENING. Cleanup and reset to OFFLINE and put our Procedure<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * State back to REGION_TRANSITION_QUEUE so the Assign starts over.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> private void handleFailure(final MasterProcedureEnv env, final RegionStateNode regionNode) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (incrementAndCheckMaxAttempts(env, regionNode)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> aborted.set(true);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> this.forceNewPlan = true;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> this.targetServer = null;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> regionNode.offline();<a name="line.315"></a>
+<span class="sourceLineNo">316</span> // We were moved to OPENING state before dispatch. Undo. It is safe to call<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // this method because it checks for OPENING first.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> env.getAssignmentManager().undoRegionAsOpening(regionNode);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> setTransitionState(RegionTransitionState.REGION_TRANSITION_QUEUE);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> private boolean incrementAndCheckMaxAttempts(final MasterProcedureEnv env,<a name="line.322"></a>
+<span class="sourceLineNo">323</span> final RegionStateNode regionNode) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> final int retries = env.getAssignmentManager().getRegionStates().<a name="line.324"></a>
+<span class="sourceLineNo">325</span> addToFailedOpen(regionNode).incrementAndGetRetries();<a name="line.325"></a>
+<span class="sourceLineNo">326</span> int max = env.getAssignmentManager().getAssignMaxAttempts();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> LOG.info("Retry=" + retries + " of max=" + max + "; " +<a name="line.327"></a>
+<span class="sourceLineNo">328</span> this + "; " + regionNode.toShortString());<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return retries >= max;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public RemoteOperation remoteCallBuild(final MasterProcedureEnv env, final ServerName serverName) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> assert serverName.equals(getRegionState(env).getRegionLocation());<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return new RegionOpenOperation(this, getRegionInfo(),<a name="line.335"></a>
+<span class="sourceLineNo">336</span> env.getAssignmentManager().getFavoredNodes(getRegionInfo()), false);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> @Override<a name="line.339"></a>
+<span class="sourceLineNo">340</span> protected boolean remoteCallFailed(final MasterProcedureEnv env, final RegionStateNode regionNode,<a name="line.340"></a>
+<span class="sourceLineNo">341</span> final IOException exception) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> handleFailure(env, regionNode);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return true;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> super.toStringClassDetails(sb);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> if (this.targetServer != null) sb.append(", target=").append(this.targetServer);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> @Override<a name="line.352"></a>
+<span class="sourceLineNo">353</span> public ServerName getServer(final MasterProcedureEnv env) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> RegionStateNode node =<a name="line.354"></a>
+<span class="sourceLineNo">355</span> env.getAssignmentManager().getRegionStates().getRegionNode(this.getRegionInfo());<a name="line.355"></a>
+<span class="sourceLineNo">356</span> if (node == null) return null;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return node.getRegionLocation();<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> @Override<a name="line.360"></a>
+<span class="sourceLineNo">361</span> protected ProcedureMetrics getProcedureMetrics(MasterProcedureEnv env) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> return env.getAssignmentManager().getAssignmentManagerMetrics().getAssignProcMetrics();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>}<a name="line.364"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
index fb54a7a..9fc2d96 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
@@ -149,239 +149,244 @@
<span class="sourceLineNo">141</span> }<a name="line.141"></a>
<span class="sourceLineNo">142</span> }<a name="line.142"></a>
<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public Boolean runCleaner() {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> FileStatus[] files = FSUtils.listStatus(this.fs, this.oldFileDir);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> checkAndDeleteEntries(files);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> } catch (IOException e) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> e = e instanceof RemoteException ?<a name="line.149"></a>
-<span class="sourceLineNo">150</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.warn("Error while cleaning the logs", e);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return false;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return true;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<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> * Sort the given list in (descending) order of the space each element takes<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.159"></a>
-<span class="sourceLineNo">160</span> */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> if (dirs == null || dirs.size() < 2) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // no need to sort for empty or single directory<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> long f1ConsumedSpace = getSpace(f1);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> long f2ConsumedSpace = getSpace(f2);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> private long getSpace(FileStatus f) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Long cached = directorySpaces.get(f);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (cached != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return cached;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> try {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> long space =<a name="line.182"></a>
-<span class="sourceLineNo">183</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> directorySpaces.put(f, space);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return space;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> } catch (IOException e) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> if (LOG.isTraceEnabled()) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> LOG.trace("failed to get space consumed by path " + f.getPath(), e);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return -1;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span> });<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> /**<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * Loop over the given directory entries, and check whether they can be deleted.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * If an entry is itself a directory it will be recursively checked and deleted itself iff<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * all subentries are deleted (and no new subentries are added in the mean time)<a name="line.199"></a>
-<span class="sourceLineNo">200</span> *<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * @param entries directory entries to check<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * @return true if all entries were successfully deleted<a name="line.202"></a>
-<span class="sourceLineNo">203</span> */<a name="line.203"></a>
-<span class="sourceLineNo">204</span> private boolean checkAndDeleteEntries(FileStatus[] entries) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (entries == null) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return true;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> boolean allEntriesDeleted = true;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> List<FileStatus> files = Lists.newArrayListWithCapacity(entries.length);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> List<FileStatus> dirs = new ArrayList<>();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> for (FileStatus child : entries) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (child.isDirectory()) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> dirs.add(child);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> } else {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> // collect all files to attempt to delete in one batch<a name="line.215"></a>
-<span class="sourceLineNo">216</span> files.add(child);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (dirs.size() > 0) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> sortByConsumedSpace(dirs);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> LOG.debug("Prepared to delete files in directories: " + dirs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> for (FileStatus child : dirs) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> Path path = child.getPath();<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // for each subdirectory delete it and all entries if possible<a name="line.224"></a>
-<span class="sourceLineNo">225</span> if (!checkAndDeleteDirectory(path)) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> allEntriesDeleted = false;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (!checkAndDeleteFiles(files)) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> allEntriesDeleted = false;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return allEntriesDeleted;<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<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> * Attempt to delete a directory and all files under that directory. Each child file is passed<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * through the delegates to see if it can be deleted. If the directory has no children when the<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * cleaners have finished it is deleted.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <p><a name="line.240"></a>
-<span class="sourceLineNo">241</span> * If new children files are added between checks of the directory, the directory will <b>not</b><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * be deleted.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @param dir directory to check<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * @return <tt>true</tt> if the directory was deleted, <tt>false</tt> otherwise.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> */<a name="line.245"></a>
-<span class="sourceLineNo">246</span> @VisibleForTesting boolean checkAndDeleteDirectory(Path dir) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (LOG.isTraceEnabled()) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> LOG.trace("Checking directory: " + dir);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> try {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> FileStatus[] children = FSUtils.listStatus(fs, dir);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> boolean allChildrenDeleted = checkAndDeleteEntries(children);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> <a name="line.254"></a>
-<span class="sourceLineNo">255</span> // if the directory still has children, we can't delete it, so we are done<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (!allChildrenDeleted) return false;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> } catch (IOException e) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> e = e instanceof RemoteException ?<a name="line.258"></a>
-<span class="sourceLineNo">259</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.259"></a>
-<span class="sourceLineNo">260</span> LOG.warn("Error while listing directory: " + dir, e);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> // couldn't list directory, so don't try to delete, and don't return success<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return false;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> // otherwise, all the children (that we know about) have been deleted, so we should try to<a name="line.265"></a>
-<span class="sourceLineNo">266</span> // delete this directory. However, don't do so recursively so we don't delete files that have<a name="line.266"></a>
-<span class="sourceLineNo">267</span> // been added since we last checked.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> try {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return fs.delete(dir, false);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } catch (IOException e) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> if (LOG.isTraceEnabled()) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> LOG.trace("Couldn't delete directory: " + dir, e);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> // couldn't delete w/o exception, so we can't return success.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return false;<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><a name="line.278"></a>
-<span class="sourceLineNo">279</span> /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * necessary.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * @return true iff successfully deleted all files<a name="line.283"></a>
-<span class="sourceLineNo">284</span> */<a name="line.284"></a>
-<span class="sourceLineNo">285</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // first check to see if the path is valid<a name="line.286"></a>
-<span class="sourceLineNo">287</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (FileStatus file : files) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (validate(file.getPath())) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> validFiles.add(file);<a name="line.291"></a>
-<span class="sourceLineNo">292</span> } else {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.293"></a>
-<span class="sourceLineNo">294</span> invalidFiles.add(file);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> // check each of the cleaners for the valid files<a name="line.299"></a>
-<span class="sourceLineNo">300</span> for (T cleaner : cleanersChain) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.302"></a>
-<span class="sourceLineNo">303</span> + this.oldFileDir);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> return false;<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> <a name="line.308"></a>
-<span class="sourceLineNo">309</span> // trace which cleaner is holding on to each file<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (LOG.isTraceEnabled()) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> for (FileStatus file : deletableValidFiles) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> if (!filteredFileSet.contains(file)) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> <a name="line.318"></a>
-<span class="sourceLineNo">319</span> deletableValidFiles = filteredFiles;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> <a name="line.321"></a>
-<span class="sourceLineNo">322</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> return deleteFiles(filesToDelete) == files.size();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> /**<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * Delete the given files<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @param filesToDelete files to delete<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * @return number of deleted files<a name="line.329"></a>
-<span class="sourceLineNo">330</span> */<a name="line.330"></a>
-<span class="sourceLineNo">331</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> int deletedFileCount = 0;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> for (FileStatus file : filesToDelete) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> Path filePath = file.getPath();<a name="line.334"></a>
-<span class="sourceLineNo">335</span> if (LOG.isDebugEnabled()) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> LOG.debug("Removing: " + filePath + " from archive");<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> try {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> boolean success = this.fs.delete(filePath, false);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (success) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> deletedFileCount++;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> LOG.warn("Attempted to delete:" + filePath<a name="line.343"></a>
-<span class="sourceLineNo">344</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span> } catch (IOException e) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> e = e instanceof RemoteException ?<a name="line.347"></a>
-<span class="sourceLineNo">348</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return deletedFileCount;<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> @Override<a name="line.355"></a>
-<span class="sourceLineNo">356</span> public void cleanup() {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for (T lc : this.cleanersChain) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> try {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> lc.stop("Exiting");<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } catch (Throwable t) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> LOG.warn("Stopping", t);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> /**<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @param enabled<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public boolean setEnabled(final boolean enabled) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> return this.enabled.getAndSet(enabled);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> public boolean getEnabled() {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return this.enabled.get();<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>}<a name="line.376"></a>
+<span class="sourceLineNo">144</span> private void preRunCleaner() {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> public Boolean runCleaner() {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> preRunCleaner();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> try {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> FileStatus[] files = FSUtils.listStatus(this.fs, this.oldFileDir);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> checkAndDeleteEntries(files);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> } catch (IOException e) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> e = e instanceof RemoteException ?<a name="line.154"></a>
+<span class="sourceLineNo">155</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.warn("Error while cleaning the logs", e);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> return true;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * Sort the given list in (descending) order of the space each element takes<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (dirs == null || dirs.size() < 2) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> // no need to sort for empty or single directory<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> long f1ConsumedSpace = getSpace(f1);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> long f2ConsumedSpace = getSpace(f2);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> private long getSpace(FileStatus f) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> Long cached = directorySpaces.get(f);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (cached != null) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return cached;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> try {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> long space =<a name="line.187"></a>
+<span class="sourceLineNo">188</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> directorySpaces.put(f, space);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return space;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> } catch (IOException e) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (LOG.isTraceEnabled()) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> LOG.trace("failed to get space consumed by path " + f.getPath(), e);<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return -1;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> });<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * Loop over the given directory entries, and check whether they can be deleted.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * If an entry is itself a directory it will be recursively checked and deleted itself iff<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * all subentries are deleted (and no new subentries are added in the mean time)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> *<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * @param entries directory entries to check<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * @return true if all entries were successfully deleted<a name="line.207"></a>
+<span class="sourceLineNo">208</span> */<a name="line.208"></a>
+<span class="sourceLineNo">209</span> private boolean checkAndDeleteEntries(FileStatus[] entries) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (entries == null) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return true;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> boolean allEntriesDeleted = true;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> List<FileStatus> files = Lists.newArrayListWithCapacity(entries.length);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> List<FileStatus> dirs = new ArrayList<>();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> for (FileStatus child : entries) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (child.isDirectory()) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> dirs.add(child);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> } else {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> // collect all files to attempt to delete in one batch<a name="line.220"></a>
+<span class="sourceLineNo">221</span> files.add(child);<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> if (dirs.size() > 0) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> sortByConsumedSpace(dirs);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> LOG.debug("Prepared to delete files in directories: " + dirs);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> for (FileStatus child : dirs) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> Path path = child.getPath();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // for each subdirectory delete it and all entries if possible<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (!checkAndDeleteDirectory(path)) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> allEntriesDeleted = false;<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> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> if (!checkAndDeleteFiles(files)) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> allEntriesDeleted = false;<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return allEntriesDeleted;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span> <a name="line.240"></a>
+<span class="sourceLineNo">241</span> /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * Attempt to delete a directory and all files under that directory. Each child file is passed<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * through the delegates to see if it can be deleted. If the directory has no children when the<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * cleaners have finished it is deleted.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <p><a name="line.245"></a>
+<span class="sourceLineNo">246</span> * If new children files are added between checks of the directory, the directory will <b>not</b><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * be deleted.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * @param dir directory to check<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * @return <tt>true</tt> if the directory was deleted, <tt>false</tt> otherwise.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> */<a name="line.250"></a>
+<span class="sourceLineNo">251</span> @VisibleForTesting boolean checkAndDeleteDirectory(Path dir) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (LOG.isTraceEnabled()) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> LOG.trace("Checking directory: " + dir);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> try {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> FileStatus[] children = FSUtils.listStatus(fs, dir);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> boolean allChildrenDeleted = checkAndDeleteEntries(children);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> <a name="line.259"></a>
+<span class="sourceLineNo">260</span> // if the directory still has children, we can't delete it, so we are done<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (!allChildrenDeleted) return false;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } catch (IOException e) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> e = e instanceof RemoteException ?<a name="line.263"></a>
+<span class="sourceLineNo">264</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> LOG.warn("Error while listing directory: " + dir, e);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> // couldn't list directory, so don't try to delete, and don't return success<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return false;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> // otherwise, all the children (that we know about) have been deleted, so we should try to<a name="line.270"></a>
+<span class="sourceLineNo">271</span> // delete this directory. However, don't do so recursively so we don't delete files that have<a name="line.271"></a>
+<span class="sourceLineNo">272</span> // been added since we last checked.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> try {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> return fs.delete(dir, false);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } catch (IOException e) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (LOG.isTraceEnabled()) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> LOG.trace("Couldn't delete directory: " + dir, e);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> // couldn't delete w/o exception, so we can't return success.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return false;<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> /**<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * necessary.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @return true iff successfully deleted all files<a name="line.288"></a>
+<span class="sourceLineNo">289</span> */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // first check to see if the path is valid<a name="line.291"></a>
+<span class="sourceLineNo">292</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.292"></a>
+<span class="sourceLineNo">293</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> for (FileStatus file : files) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> if (validate(file.getPath())) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> validFiles.add(file);<a name="line.296"></a>
+<span class="sourceLineNo">297</span> } else {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.298"></a>
+<span class="sourceLineNo">299</span> invalidFiles.add(file);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<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>
+<span class="sourceLineNo">303</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> // check each of the cleaners for the valid files<a name="line.304"></a>
+<span class="sourceLineNo">305</span> for (T cleaner : cleanersChain) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + this.oldFileDir);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return false;<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> <a name="line.313"></a>
+<span class="sourceLineNo">314</span> // trace which cleaner is holding on to each file<a name="line.314"></a>
+<span class="sourceLineNo">315</span> if (LOG.isTraceEnabled()) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> for (FileStatus file : deletableValidFiles) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> if (!filteredFileSet.contains(file)) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span> <a name="line.323"></a>
+<span class="sourceLineNo">324</span> deletableValidFiles = filteredFiles;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> <a name="line.326"></a>
+<span class="sourceLineNo">327</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> return deleteFiles(filesToDelete) == files.size();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * Delete the given files<a name="line.332"></a>
+<span class="sourceLineNo">333</span> * @param filesToDelete files to delete<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * @return number of deleted files<a name="line.334"></a>
+<span class="sourceLineNo">335</span> */<a name="line.335"></a>
+<span class="sourceLineNo">336</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> int deletedFileCount = 0;<a name="line.337"></a>
+<span class="sourceLineNo">338</span> for (FileStatus file : filesToDelete) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> Path filePath = file.getPath();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> if (LOG.isDebugEnabled()) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> LOG.debug("Removing: " + filePath + " from archive");<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span> try {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> boolean success = this.fs.delete(filePath, false);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> if (success) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> deletedFileCount++;<a name="line.346"></a>
+<span class="sourceLineNo">347</span> } else {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.warn("Attempted to delete:" + filePath<a name="line.348"></a>
+<span class="sourceLineNo">349</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> } catch (IOException e) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> e = e instanceof RemoteException ?<a name="line.352"></a>
+<span class="sourceLineNo">353</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.353"></a>
+<span class="sourceLineNo">354</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return deletedFileCount;<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> @Override<a name="line.360"></a>
+<span class="sourceLineNo">361</span> public void cleanup() {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (T lc : this.cleanersChain) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> try {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> lc.stop("Exiting");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> } catch (Throwable t) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> LOG.warn("Stopping", t);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @param enabled<a name="line.372"></a>
+<span class="sourceLineNo">373</span> */<a name="line.373"></a>
+<span class="sourceLineNo">374</span> public boolean setEnabled(final boolean enabled) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> return this.enabled.getAndSet(enabled);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> public boolean getEnabled() {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return this.enabled.get();<a name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>}<a name="line.381"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.html
index 16cb813..5fab34b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.html
@@ -52,7 +52,13 @@
<span class="sourceLineNo">044</span> * this method is used to pass some instance into subclass<a name="line.44"></a>
<span class="sourceLineNo">045</span> * */<a name="line.45"></a>
<span class="sourceLineNo">046</span> void init(Map<String, Object> params);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>}<a name="line.47"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> /**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Used to do some initialize work before every period clean<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span> default void preClean() {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>}<a name="line.53"></a>