http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3353a0ac/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.SnapshotFileInspector.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.SnapshotFileInspector.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.SnapshotFileInspector.html
index 206b623..796ddc1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.SnapshotFileInspector.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.SnapshotFileInspector.html
@@ -35,7 +35,7 @@
 <span class="sourceLineNo">027</span>import java.util.Set;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import java.util.Timer;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import java.util.TimerTask;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
java.util.concurrent.locks.ReentrantLock;<a name="line.30"></a>
+<span class="sourceLineNo">030</span>import java.util.concurrent.locks.Lock;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.hadoop.fs.FileStatus;<a 
name="line.33"></a>
@@ -192,183 +192,191 @@
 <span class="sourceLineNo">184</span>    List&lt;FileStatus&gt; 
unReferencedFiles = Lists.newArrayList();<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    List&lt;String&gt; 
snapshotsInProgress = null;<a name="line.185"></a>
 <span class="sourceLineNo">186</span>    boolean refreshed = false;<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    for (FileStatus file : files) {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      String fileName = 
file.getPath().getName();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      if (!refreshed &amp;&amp; 
!cache.contains(fileName)) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        refreshCache();<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>        refreshed = true;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (cache.contains(fileName)) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        continue;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      if (snapshotsInProgress == null) 
{<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        snapshotsInProgress = 
getSnapshotsInProgress(snapshotManager);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      if 
(snapshotsInProgress.contains(fileName)) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        continue;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      unReferencedFiles.add(file);<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    return unReferencedFiles;<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>  private synchronized void 
refreshCache() throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    // get the status of the snapshots 
directory and check if it is has changes<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    FileStatus dirStatus;<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>    try {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      dirStatus = 
fs.getFileStatus(snapshotDir);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    } catch (FileNotFoundException e) {<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      if (this.cache.size() &gt; 0) {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>        LOG.error("Snapshot directory: " 
+ snapshotDir + " doesn't exist");<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      return;<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 the snapshot directory wasn't 
modified since we last check, we are done<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    if (dirStatus.getModificationTime() 
&lt;= this.lastModifiedTime) return;<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    // directory was modified, so we need 
to reload our cache<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    // there could be a slight race here 
where we miss the cache, check the directory modification<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    // time, then someone updates the 
directory, causing us to not scan the directory again.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    // However, snapshot directories are 
only created once, so this isn't an issue.<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>    // 1. update the modified time<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    this.lastModifiedTime = 
dirStatus.getModificationTime();<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 2.clear the cache<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>    this.cache.clear();<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    Map&lt;String, 
SnapshotDirectoryInfo&gt; known = new HashMap&lt;&gt;();<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // 3. check each of the snapshot 
directories<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    FileStatus[] snapshots = 
FSUtils.listStatus(fs, snapshotDir);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    if (snapshots == null) {<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>      // remove all the remembered 
snapshots because we don't have any left<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      if (LOG.isDebugEnabled() &amp;&amp; 
this.snapshots.size() &gt; 0) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        LOG.debug("No snapshots on-disk, 
cache empty");<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      this.snapshots.clear();<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<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>    // 3.1 iterate through the on-disk 
snapshots<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      String name = 
snapshot.getPath().getName();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      // its not the tmp dir,<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>      if 
(!name.equals(SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME)) {<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>        SnapshotDirectoryInfo files = 
this.snapshots.remove(name);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        // 3.1.1 if we don't know about 
the snapshot or its been modified, we need to update the<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        // files the latter could occur 
where I create a snapshot, then delete it, and then make a<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>        // new snapshot with the same 
name. We will need to update the cache the information from<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        // that new snapshot, even though 
it has the same name as the files referenced have<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        // probably changed.<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>        if (files == null || 
files.hasBeenModified(snapshot.getModificationTime())) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          // get all files for the 
snapshot and create a new info<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          Collection&lt;String&gt; 
storedFiles = fileInspector.filesUnderSnapshot(snapshot.getPath());<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>          files = new 
SnapshotDirectoryInfo(snapshot.getModificationTime(), storedFiles);<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>        }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        // 3.2 add all the files to 
cache<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        
this.cache.addAll(files.getFiles());<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        known.put(name, files);<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    // 4. set the snapshots we are 
tracking<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    this.snapshots.clear();<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    this.snapshots.putAll(known);<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>  @VisibleForTesting List&lt;String&gt; 
getSnapshotsInProgress(<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    final SnapshotManager 
snapshotManager) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    List&lt;String&gt; snapshotInProgress 
= Lists.newArrayList();<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    Path snapshotTmpDir = new 
Path(snapshotDir, SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME);<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    FileStatus[] running = 
FSUtils.listStatus(fs, snapshotTmpDir);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    if (running != null) {<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>      for (FileStatus run : running) {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>        ReentrantLock lock = null;<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>        if (snapshotManager != null) {<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>          lock = 
snapshotManager.getLocks().acquireLock(run.getPath().getName());<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>        }<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        try {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          
snapshotInProgress.addAll(fileInspector.filesUnderSnapshot(run.getPath()));<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        } catch 
(CorruptedSnapshotException e) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          // See HBASE-16464<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>          if (e.getCause() instanceof 
FileNotFoundException) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>            // If the snapshot is 
corrupt, we will delete it<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            fs.delete(run.getPath(), 
true);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>            LOG.warn("delete the " + 
run.getPath() + " due to exception:", e.getCause());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          } else {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            throw e;<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>          }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        } finally {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>          if (lock != null) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>            lock.unlock();<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>          }<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>    return snapshotInProgress;<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>  }<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>   * Simple helper task that just 
periodically attempts to refresh the cache<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   */<a name="line.308"></a>
-<span class="sourceLineNo">309</span>  public class RefreshCacheTask extends 
TimerTask {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    public void run() {<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>      try {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        
SnapshotFileCache.this.refreshCache();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      } catch (IOException e) {<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        LOG.warn("Failed to refresh 
snapshot hfile cache!", e);<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><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  public void stop(String why) {<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>    if (!this.stop) {<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>      this.stop = true;<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>      this.refreshTimer.cancel();<a 
name="line.324"></a>
+<span class="sourceLineNo">187</span>    Lock lock = null;<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    if (snapshotManager != null) {<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      lock = 
snapshotManager.getTakingSnapshotLock().writeLock();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    if (lock == null || lock.tryLock()) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      try {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        if (snapshotManager == null || 
snapshotManager.isTakingAnySnapshot()) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          LOG.warn("Not checking 
unreferenced files since snapshot is running, it will "<a name="line.194"></a>
+<span class="sourceLineNo">195</span>              + "skip to clean the HFiles 
this time");<a name="line.195"></a>
+<span class="sourceLineNo">196</span>          return unReferencedFiles;<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        for (FileStatus file : files) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>          String fileName = 
file.getPath().getName();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>          if (!refreshed &amp;&amp; 
!cache.contains(fileName)) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            refreshCache();<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>            refreshed = true;<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>          }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>          if (cache.contains(fileName)) 
{<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            continue;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>          }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>          if (snapshotsInProgress == 
null) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            snapshotsInProgress = 
getSnapshotsInProgress();<a name="line.208"></a>
+<span class="sourceLineNo">209</span>          }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>          if 
(snapshotsInProgress.contains(fileName)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            continue;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>          }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>          unReferencedFiles.add(file);<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>        }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      } finally {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        if (lock != null) {<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>          lock.unlock();<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>    return unReferencedFiles;<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 synchronized void 
refreshCache() throws IOException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    // get the status of the snapshots 
directory and check if it is has changes<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileStatus dirStatus;<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      dirStatus = 
fs.getFileStatus(snapshotDir);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    } catch (FileNotFoundException e) {<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>      if (this.cache.size() &gt; 0) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>        LOG.error("Snapshot directory: " 
+ snapshotDir + " doesn't exist");<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      return;<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 the snapshot directory wasn't 
modified since we last check, we are done<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    if (dirStatus.getModificationTime() 
&lt;= this.lastModifiedTime) return;<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>    // directory was modified, so we need 
to reload our cache<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    // there could be a slight race here 
where we miss the cache, check the directory modification<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // time, then someone updates the 
directory, causing us to not scan the directory again.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    // However, snapshot directories are 
only created once, so this isn't an issue.<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>    // 1. update the modified time<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    this.lastModifiedTime = 
dirStatus.getModificationTime();<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 2.clear the cache<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>    this.cache.clear();<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    Map&lt;String, 
SnapshotDirectoryInfo&gt; known = new HashMap&lt;&gt;();<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    // 3. check each of the snapshot 
directories<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    FileStatus[] snapshots = 
FSUtils.listStatus(fs, snapshotDir);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    if (snapshots == null) {<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      // remove all the remembered 
snapshots because we don't have any left<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (LOG.isDebugEnabled() &amp;&amp; 
this.snapshots.size() &gt; 0) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        LOG.debug("No snapshots on-disk, 
cache empty");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      this.snapshots.clear();<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>      return;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    // 3.1 iterate through the on-disk 
snapshots<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      String name = 
snapshot.getPath().getName();<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      // its not the tmp dir,<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>      if 
(!name.equals(SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME)) {<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>        SnapshotDirectoryInfo files = 
this.snapshots.remove(name);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        // 3.1.1 if we don't know about 
the snapshot or its been modified, we need to update the<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        // files the latter could occur 
where I create a snapshot, then delete it, and then make a<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>        // new snapshot with the same 
name. We will need to update the cache the information from<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>        // that new snapshot, even though 
it has the same name as the files referenced have<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        // probably changed.<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>        if (files == null || 
files.hasBeenModified(snapshot.getModificationTime())) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>          // get all files for the 
snapshot and create a new info<a name="line.274"></a>
+<span class="sourceLineNo">275</span>          Collection&lt;String&gt; 
storedFiles = fileInspector.filesUnderSnapshot(snapshot.getPath());<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>          files = new 
SnapshotDirectoryInfo(snapshot.getModificationTime(), storedFiles);<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        // 3.2 add all the files to 
cache<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        
this.cache.addAll(files.getFiles());<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        known.put(name, files);<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>    // 4. set the snapshots we are 
tracking<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    this.snapshots.clear();<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>    this.snapshots.putAll(known);<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>  }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>  @VisibleForTesting<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>  List&lt;String&gt; 
getSnapshotsInProgress() throws IOException {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    List&lt;String&gt; snapshotInProgress 
= Lists.newArrayList();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    Path snapshotTmpDir = new 
Path(snapshotDir, SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME);<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    FileStatus[] running = 
FSUtils.listStatus(fs, snapshotTmpDir);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (running != null) {<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      for (FileStatus run : running) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        try {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          
snapshotInProgress.addAll(fileInspector.filesUnderSnapshot(run.getPath()));<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>        } catch 
(CorruptedSnapshotException e) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>          // See HBASE-16464<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>          if (e.getCause() instanceof 
FileNotFoundException) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>            // If the snapshot is 
corrupt, we will delete it<a name="line.302"></a>
+<span class="sourceLineNo">303</span>            fs.delete(run.getPath(), 
true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>            LOG.warn("delete the " + 
run.getPath() + " due to exception:", e.getCause());<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          } else {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>            throw e;<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>          }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    return snapshotInProgress;<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>  /**<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   * Simple helper task that just 
periodically attempts to refresh the cache<a name="line.315"></a>
+<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>  public class RefreshCacheTask extends 
TimerTask {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    @Override<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    public void run() {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>      try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        
SnapshotFileCache.this.refreshCache();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      } catch (IOException e) {<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>        LOG.warn("Failed to refresh 
snapshot hfile cache!", e);<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>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @Override<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  public boolean isStopped() {<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>    return this.stop;<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<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>   * Information about a snapshot 
directory<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   */<a name="line.336"></a>
-<span class="sourceLineNo">337</span>  private static class 
SnapshotDirectoryInfo {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    long lastModified;<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    Collection&lt;String&gt; files;<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    public SnapshotDirectoryInfo(long 
mtime, Collection&lt;String&gt; files) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      this.lastModified = mtime;<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>      this.files = files;<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>    /**<a name="line.346"></a>
-<span class="sourceLineNo">347</span>     * @return the hfiles in the snapshot 
when &lt;tt&gt;this&lt;/tt&gt; was made.<a name="line.347"></a>
-<span class="sourceLineNo">348</span>     */<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    public Collection&lt;String&gt; 
getFiles() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      return this.files;<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>    /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>     * Check if the snapshot directory 
has been modified<a name="line.354"></a>
-<span class="sourceLineNo">355</span>     * @param mtime current modification 
time of the directory<a name="line.355"></a>
-<span class="sourceLineNo">356</span>     * @return &lt;tt&gt;true&lt;/tt&gt; 
if it the modification time of the directory is newer time when we<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>     *         created 
&lt;tt&gt;this&lt;/tt&gt;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>     */<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    public boolean hasBeenModified(long 
mtime) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      return this.lastModified &lt; 
mtime;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>}<a name="line.363"></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 void stop(String why) {<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    if (!this.stop) {<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>      this.stop = true;<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.refreshTimer.cancel();<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>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  public boolean isStopped() {<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>    return this.stop;<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>  /**<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   * Information about a snapshot 
directory<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   */<a name="line.344"></a>
+<span class="sourceLineNo">345</span>  private static class 
SnapshotDirectoryInfo {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    long lastModified;<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>    Collection&lt;String&gt; files;<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>    public SnapshotDirectoryInfo(long 
mtime, Collection&lt;String&gt; files) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      this.lastModified = mtime;<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      this.files = files;<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<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>     * @return the hfiles in the snapshot 
when &lt;tt&gt;this&lt;/tt&gt; was made.<a name="line.355"></a>
+<span class="sourceLineNo">356</span>     */<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    public Collection&lt;String&gt; 
getFiles() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      return this.files;<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">361</span>    /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span>     * Check if the snapshot directory 
has been modified<a name="line.362"></a>
+<span class="sourceLineNo">363</span>     * @param mtime current modification 
time of the directory<a name="line.363"></a>
+<span class="sourceLineNo">364</span>     * @return &lt;tt&gt;true&lt;/tt&gt; 
if it the modification time of the directory is newer time when we<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>     *         created 
&lt;tt&gt;this&lt;/tt&gt;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>     */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    public boolean hasBeenModified(long 
mtime) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      return this.lastModified &lt; 
mtime;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3353a0ac/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.html
index 206b623..796ddc1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.html
@@ -35,7 +35,7 @@
 <span class="sourceLineNo">027</span>import java.util.Set;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import java.util.Timer;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import java.util.TimerTask;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
java.util.concurrent.locks.ReentrantLock;<a name="line.30"></a>
+<span class="sourceLineNo">030</span>import java.util.concurrent.locks.Lock;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.hadoop.fs.FileStatus;<a 
name="line.33"></a>
@@ -192,183 +192,191 @@
 <span class="sourceLineNo">184</span>    List&lt;FileStatus&gt; 
unReferencedFiles = Lists.newArrayList();<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    List&lt;String&gt; 
snapshotsInProgress = null;<a name="line.185"></a>
 <span class="sourceLineNo">186</span>    boolean refreshed = false;<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    for (FileStatus file : files) {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      String fileName = 
file.getPath().getName();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      if (!refreshed &amp;&amp; 
!cache.contains(fileName)) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        refreshCache();<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>        refreshed = true;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (cache.contains(fileName)) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        continue;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      if (snapshotsInProgress == null) 
{<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        snapshotsInProgress = 
getSnapshotsInProgress(snapshotManager);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      if 
(snapshotsInProgress.contains(fileName)) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        continue;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      unReferencedFiles.add(file);<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    return unReferencedFiles;<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>  private synchronized void 
refreshCache() throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    // get the status of the snapshots 
directory and check if it is has changes<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    FileStatus dirStatus;<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>    try {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      dirStatus = 
fs.getFileStatus(snapshotDir);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    } catch (FileNotFoundException e) {<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      if (this.cache.size() &gt; 0) {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>        LOG.error("Snapshot directory: " 
+ snapshotDir + " doesn't exist");<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      return;<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 the snapshot directory wasn't 
modified since we last check, we are done<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    if (dirStatus.getModificationTime() 
&lt;= this.lastModifiedTime) return;<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    // directory was modified, so we need 
to reload our cache<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    // there could be a slight race here 
where we miss the cache, check the directory modification<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    // time, then someone updates the 
directory, causing us to not scan the directory again.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    // However, snapshot directories are 
only created once, so this isn't an issue.<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>    // 1. update the modified time<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    this.lastModifiedTime = 
dirStatus.getModificationTime();<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 2.clear the cache<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>    this.cache.clear();<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    Map&lt;String, 
SnapshotDirectoryInfo&gt; known = new HashMap&lt;&gt;();<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // 3. check each of the snapshot 
directories<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    FileStatus[] snapshots = 
FSUtils.listStatus(fs, snapshotDir);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    if (snapshots == null) {<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>      // remove all the remembered 
snapshots because we don't have any left<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      if (LOG.isDebugEnabled() &amp;&amp; 
this.snapshots.size() &gt; 0) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        LOG.debug("No snapshots on-disk, 
cache empty");<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      this.snapshots.clear();<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>      return;<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>    // 3.1 iterate through the on-disk 
snapshots<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      String name = 
snapshot.getPath().getName();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      // its not the tmp dir,<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>      if 
(!name.equals(SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME)) {<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>        SnapshotDirectoryInfo files = 
this.snapshots.remove(name);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        // 3.1.1 if we don't know about 
the snapshot or its been modified, we need to update the<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        // files the latter could occur 
where I create a snapshot, then delete it, and then make a<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>        // new snapshot with the same 
name. We will need to update the cache the information from<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        // that new snapshot, even though 
it has the same name as the files referenced have<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        // probably changed.<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>        if (files == null || 
files.hasBeenModified(snapshot.getModificationTime())) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          // get all files for the 
snapshot and create a new info<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          Collection&lt;String&gt; 
storedFiles = fileInspector.filesUnderSnapshot(snapshot.getPath());<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>          files = new 
SnapshotDirectoryInfo(snapshot.getModificationTime(), storedFiles);<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>        }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        // 3.2 add all the files to 
cache<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        
this.cache.addAll(files.getFiles());<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        known.put(name, files);<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    // 4. set the snapshots we are 
tracking<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    this.snapshots.clear();<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    this.snapshots.putAll(known);<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>  @VisibleForTesting List&lt;String&gt; 
getSnapshotsInProgress(<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    final SnapshotManager 
snapshotManager) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    List&lt;String&gt; snapshotInProgress 
= Lists.newArrayList();<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    Path snapshotTmpDir = new 
Path(snapshotDir, SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME);<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    FileStatus[] running = 
FSUtils.listStatus(fs, snapshotTmpDir);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    if (running != null) {<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>      for (FileStatus run : running) {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>        ReentrantLock lock = null;<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>        if (snapshotManager != null) {<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>          lock = 
snapshotManager.getLocks().acquireLock(run.getPath().getName());<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>        }<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        try {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          
snapshotInProgress.addAll(fileInspector.filesUnderSnapshot(run.getPath()));<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        } catch 
(CorruptedSnapshotException e) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          // See HBASE-16464<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>          if (e.getCause() instanceof 
FileNotFoundException) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>            // If the snapshot is 
corrupt, we will delete it<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            fs.delete(run.getPath(), 
true);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>            LOG.warn("delete the " + 
run.getPath() + " due to exception:", e.getCause());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          } else {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            throw e;<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>          }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        } finally {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>          if (lock != null) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>            lock.unlock();<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>          }<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>    return snapshotInProgress;<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>  }<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>   * Simple helper task that just 
periodically attempts to refresh the cache<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   */<a name="line.308"></a>
-<span class="sourceLineNo">309</span>  public class RefreshCacheTask extends 
TimerTask {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    public void run() {<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>      try {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        
SnapshotFileCache.this.refreshCache();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      } catch (IOException e) {<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        LOG.warn("Failed to refresh 
snapshot hfile cache!", e);<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><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  public void stop(String why) {<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>    if (!this.stop) {<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>      this.stop = true;<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>      this.refreshTimer.cancel();<a 
name="line.324"></a>
+<span class="sourceLineNo">187</span>    Lock lock = null;<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    if (snapshotManager != null) {<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      lock = 
snapshotManager.getTakingSnapshotLock().writeLock();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    if (lock == null || lock.tryLock()) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      try {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        if (snapshotManager == null || 
snapshotManager.isTakingAnySnapshot()) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          LOG.warn("Not checking 
unreferenced files since snapshot is running, it will "<a name="line.194"></a>
+<span class="sourceLineNo">195</span>              + "skip to clean the HFiles 
this time");<a name="line.195"></a>
+<span class="sourceLineNo">196</span>          return unReferencedFiles;<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        for (FileStatus file : files) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>          String fileName = 
file.getPath().getName();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>          if (!refreshed &amp;&amp; 
!cache.contains(fileName)) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            refreshCache();<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>            refreshed = true;<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>          }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>          if (cache.contains(fileName)) 
{<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            continue;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>          }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>          if (snapshotsInProgress == 
null) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            snapshotsInProgress = 
getSnapshotsInProgress();<a name="line.208"></a>
+<span class="sourceLineNo">209</span>          }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>          if 
(snapshotsInProgress.contains(fileName)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            continue;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>          }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>          unReferencedFiles.add(file);<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>        }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      } finally {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        if (lock != null) {<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>          lock.unlock();<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>    return unReferencedFiles;<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 synchronized void 
refreshCache() throws IOException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    // get the status of the snapshots 
directory and check if it is has changes<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    FileStatus dirStatus;<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      dirStatus = 
fs.getFileStatus(snapshotDir);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    } catch (FileNotFoundException e) {<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>      if (this.cache.size() &gt; 0) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>        LOG.error("Snapshot directory: " 
+ snapshotDir + " doesn't exist");<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      return;<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 the snapshot directory wasn't 
modified since we last check, we are done<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    if (dirStatus.getModificationTime() 
&lt;= this.lastModifiedTime) return;<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>    // directory was modified, so we need 
to reload our cache<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    // there could be a slight race here 
where we miss the cache, check the directory modification<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    // time, then someone updates the 
directory, causing us to not scan the directory again.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    // However, snapshot directories are 
only created once, so this isn't an issue.<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span>    // 1. update the modified time<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    this.lastModifiedTime = 
dirStatus.getModificationTime();<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 2.clear the cache<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>    this.cache.clear();<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    Map&lt;String, 
SnapshotDirectoryInfo&gt; known = new HashMap&lt;&gt;();<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    // 3. check each of the snapshot 
directories<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    FileStatus[] snapshots = 
FSUtils.listStatus(fs, snapshotDir);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    if (snapshots == null) {<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      // remove all the remembered 
snapshots because we don't have any left<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (LOG.isDebugEnabled() &amp;&amp; 
this.snapshots.size() &gt; 0) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        LOG.debug("No snapshots on-disk, 
cache empty");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      this.snapshots.clear();<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>      return;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    // 3.1 iterate through the on-disk 
snapshots<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      String name = 
snapshot.getPath().getName();<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      // its not the tmp dir,<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>      if 
(!name.equals(SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME)) {<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>        SnapshotDirectoryInfo files = 
this.snapshots.remove(name);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        // 3.1.1 if we don't know about 
the snapshot or its been modified, we need to update the<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        // files the latter could occur 
where I create a snapshot, then delete it, and then make a<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>        // new snapshot with the same 
name. We will need to update the cache the information from<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>        // that new snapshot, even though 
it has the same name as the files referenced have<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        // probably changed.<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>        if (files == null || 
files.hasBeenModified(snapshot.getModificationTime())) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>          // get all files for the 
snapshot and create a new info<a name="line.274"></a>
+<span class="sourceLineNo">275</span>          Collection&lt;String&gt; 
storedFiles = fileInspector.filesUnderSnapshot(snapshot.getPath());<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>          files = new 
SnapshotDirectoryInfo(snapshot.getModificationTime(), storedFiles);<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        // 3.2 add all the files to 
cache<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        
this.cache.addAll(files.getFiles());<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        known.put(name, files);<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>    // 4. set the snapshots we are 
tracking<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    this.snapshots.clear();<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>    this.snapshots.putAll(known);<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>  }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>  @VisibleForTesting<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>  List&lt;String&gt; 
getSnapshotsInProgress() throws IOException {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    List&lt;String&gt; snapshotInProgress 
= Lists.newArrayList();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    // only add those files to the cache, 
but not to the known snapshots<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    Path snapshotTmpDir = new 
Path(snapshotDir, SnapshotDescriptionUtils.SNAPSHOT_TMP_DIR_NAME);<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    FileStatus[] running = 
FSUtils.listStatus(fs, snapshotTmpDir);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (running != null) {<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      for (FileStatus run : running) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        try {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          
snapshotInProgress.addAll(fileInspector.filesUnderSnapshot(run.getPath()));<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>        } catch 
(CorruptedSnapshotException e) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>          // See HBASE-16464<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>          if (e.getCause() instanceof 
FileNotFoundException) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>            // If the snapshot is 
corrupt, we will delete it<a name="line.302"></a>
+<span class="sourceLineNo">303</span>            fs.delete(run.getPath(), 
true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>            LOG.warn("delete the " + 
run.getPath() + " due to exception:", e.getCause());<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          } else {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>            throw e;<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>          }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    return snapshotInProgress;<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>  /**<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   * Simple helper task that just 
periodically attempts to refresh the cache<a name="line.315"></a>
+<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>  public class RefreshCacheTask extends 
TimerTask {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    @Override<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    public void run() {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>      try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        
SnapshotFileCache.this.refreshCache();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      } catch (IOException e) {<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>        LOG.warn("Failed to refresh 
snapshot hfile cache!", e);<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>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @Override<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  public boolean isStopped() {<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>    return this.stop;<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<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>   * Information about a snapshot 
directory<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   */<a name="line.336"></a>
-<span class="sourceLineNo">337</span>  private static class 
SnapshotDirectoryInfo {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    long lastModified;<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    Collection&lt;String&gt; files;<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    public SnapshotDirectoryInfo(long 
mtime, Collection&lt;String&gt; files) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      this.lastModified = mtime;<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>      this.files = files;<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>    /**<a name="line.346"></a>
-<span class="sourceLineNo">347</span>     * @return the hfiles in the snapshot 
when &lt;tt&gt;this&lt;/tt&gt; was made.<a name="line.347"></a>
-<span class="sourceLineNo">348</span>     */<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    public Collection&lt;String&gt; 
getFiles() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      return this.files;<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>    /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>     * Check if the snapshot directory 
has been modified<a name="line.354"></a>
-<span class="sourceLineNo">355</span>     * @param mtime current modification 
time of the directory<a name="line.355"></a>
-<span class="sourceLineNo">356</span>     * @return &lt;tt&gt;true&lt;/tt&gt; 
if it the modification time of the directory is newer time when we<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>     *         created 
&lt;tt&gt;this&lt;/tt&gt;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>     */<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    public boolean hasBeenModified(long 
mtime) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      return this.lastModified &lt; 
mtime;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>}<a name="line.363"></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 void stop(String why) {<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    if (!this.stop) {<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>      this.stop = true;<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>      this.refreshTimer.cancel();<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>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  @Override<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  public boolean isStopped() {<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>    return this.stop;<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>  /**<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   * Information about a snapshot 
directory<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   */<a name="line.344"></a>
+<span class="sourceLineNo">345</span>  private static class 
SnapshotDirectoryInfo {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    long lastModified;<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>    Collection&lt;String&gt; files;<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>    public SnapshotDirectoryInfo(long 
mtime, Collection&lt;String&gt; files) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      this.lastModified = mtime;<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      this.files = files;<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<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>     * @return the hfiles in the snapshot 
when &lt;tt&gt;this&lt;/tt&gt; was made.<a name="line.355"></a>
+<span class="sourceLineNo">356</span>     */<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    public Collection&lt;String&gt; 
getFiles() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      return this.files;<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">361</span>    /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span>     * Check if the snapshot directory 
has been modified<a name="line.362"></a>
+<span class="sourceLineNo">363</span>     * @param mtime current modification 
time of the directory<a name="line.363"></a>
+<span class="sourceLineNo">364</span>     * @return &lt;tt&gt;true&lt;/tt&gt; 
if it the modification time of the directory is newer time when we<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>     *         created 
&lt;tt&gt;this&lt;/tt&gt;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>     */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    public boolean hasBeenModified(long 
mtime) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      return this.lastModified &lt; 
mtime;<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>
 
 
 

Reply via email to