You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/10/02 14:54:02 UTC
[11/26] hbase-site git commit: Published site at
42aa3dd463c0d30a9b940d296b87316b5c67e1f5.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/37b8a04a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.SnapshotFiles.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.SnapshotFiles.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.SnapshotFiles.html
index 9319626..201cbdc 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.SnapshotFiles.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.SnapshotFiles.html
@@ -76,230 +76,226 @@
<span class="sourceLineNo">068</span><a name="line.68"></a>
<span class="sourceLineNo">069</span> private static final Logger LOG = LoggerFactory.getLogger(TestSnapshotFileCache.class);<a name="line.69"></a>
<span class="sourceLineNo">070</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private static long sequenceId = 0;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static FileSystem fs;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private static Path rootDir;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> @BeforeClass<a name="line.75"></a>
-<span class="sourceLineNo">076</span> public static void startCluster() throws Exception {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> UTIL.startMiniDFSCluster(1);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> fs = UTIL.getDFSCluster().getFileSystem();<a name="line.78"></a>
-<span class="sourceLineNo">079</span> rootDir = UTIL.getDefaultRootDirPath();<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> @AfterClass<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public static void stopCluster() throws Exception {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> UTIL.shutdownMiniDFSCluster();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> @After<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public void cleanupFiles() throws Exception {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // cleanup the snapshot directory<a name="line.89"></a>
-<span class="sourceLineNo">090</span> Path snapshotDir = SnapshotDescriptionUtils.getSnapshotsDir(rootDir);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> fs.delete(snapshotDir, true);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> @Test<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public void testLoadAndDelete() throws IOException {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> // don't refresh the cache unless we tell it to<a name="line.96"></a>
-<span class="sourceLineNo">097</span> long period = Long.MAX_VALUE;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.98"></a>
-<span class="sourceLineNo">099</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> createAndTestSnapshotV1(cache, "snapshot1a", false, true);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> createAndTestSnapshotV1(cache, "snapshot1b", true, true);<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> createAndTestSnapshotV2(cache, "snapshot2a", false, true);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> createAndTestSnapshotV2(cache, "snapshot2b", true, true);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> @Test<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public void testReloadModifiedDirectory() throws IOException {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // don't refresh the cache unless we tell it to<a name="line.110"></a>
-<span class="sourceLineNo">111</span> long period = Long.MAX_VALUE;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.112"></a>
-<span class="sourceLineNo">113</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> createAndTestSnapshotV1(cache, "snapshot1", false, true);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> // now delete the snapshot and add a file with a different name<a name="line.116"></a>
-<span class="sourceLineNo">117</span> createAndTestSnapshotV1(cache, "snapshot1", false, false);<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> createAndTestSnapshotV2(cache, "snapshot2", false, true);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> // now delete the snapshot and add a file with a different name<a name="line.120"></a>
-<span class="sourceLineNo">121</span> createAndTestSnapshotV2(cache, "snapshot2", false, false);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> @Test<a name="line.124"></a>
-<span class="sourceLineNo">125</span> public void testSnapshotTempDirReload() throws IOException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> long period = Long.MAX_VALUE;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> // This doesn't refresh cache until we invoke it explicitly<a name="line.127"></a>
-<span class="sourceLineNo">128</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.128"></a>
-<span class="sourceLineNo">129</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> // Add a new non-tmp snapshot<a name="line.131"></a>
-<span class="sourceLineNo">132</span> createAndTestSnapshotV1(cache, "snapshot0v1", false, false);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> createAndTestSnapshotV1(cache, "snapshot0v2", false, false);<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> // Add a new tmp snapshot<a name="line.135"></a>
-<span class="sourceLineNo">136</span> createAndTestSnapshotV2(cache, "snapshot1", true, false);<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Add another tmp snapshot<a name="line.138"></a>
-<span class="sourceLineNo">139</span> createAndTestSnapshotV2(cache, "snapshot2", true, false);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> @Test<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public void testWeNeverCacheTmpDirAndLoadIt() throws Exception {<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> final AtomicInteger count = new AtomicInteger(0);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> // don't refresh the cache unless we tell it to<a name="line.146"></a>
-<span class="sourceLineNo">147</span> long period = Long.MAX_VALUE;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.148"></a>
-<span class="sourceLineNo">149</span> "test-snapshot-file-cache-refresh", new SnapshotFiles()) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> @Override<a name="line.150"></a>
-<span class="sourceLineNo">151</span> List<String> getSnapshotsInProgress(final SnapshotManager snapshotManager)<a name="line.151"></a>
-<span class="sourceLineNo">152</span> throws IOException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> List<String> result = super.getSnapshotsInProgress(snapshotManager);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> count.incrementAndGet();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return result;<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> @Override public void triggerCacheRefreshForTesting() {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> super.triggerCacheRefreshForTesting();<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> SnapshotMock.SnapshotBuilder complete =<a name="line.163"></a>
-<span class="sourceLineNo">164</span> createAndTestSnapshotV1(cache, "snapshot", false, false);<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> SnapshotMock.SnapshotBuilder inProgress =<a name="line.166"></a>
-<span class="sourceLineNo">167</span> createAndTestSnapshotV1(cache, "snapshotInProgress", true, false);<a name="line.167"></a>
+<span class="sourceLineNo">071</span> private static FileSystem fs;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private static Path rootDir;<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> @BeforeClass<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static void startCluster() throws Exception {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> UTIL.startMiniDFSCluster(1);<a name="line.76"></a>
+<span class="sourceLineNo">077</span> fs = UTIL.getDFSCluster().getFileSystem();<a name="line.77"></a>
+<span class="sourceLineNo">078</span> rootDir = UTIL.getDefaultRootDirPath();<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> @AfterClass<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public static void stopCluster() throws Exception {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> UTIL.shutdownMiniDFSCluster();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> @After<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public void cleanupFiles() throws Exception {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // cleanup the snapshot directory<a name="line.88"></a>
+<span class="sourceLineNo">089</span> Path snapshotDir = SnapshotDescriptionUtils.getSnapshotsDir(rootDir);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> fs.delete(snapshotDir, true);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> @Test<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public void testLoadAndDelete() throws IOException {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> // don't refresh the cache unless we tell it to<a name="line.95"></a>
+<span class="sourceLineNo">096</span> long period = Long.MAX_VALUE;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.97"></a>
+<span class="sourceLineNo">098</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> createAndTestSnapshotV1(cache, "snapshot1a", false, true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> createAndTestSnapshotV1(cache, "snapshot1b", true, true);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> createAndTestSnapshotV2(cache, "snapshot2a", false, true);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> createAndTestSnapshotV2(cache, "snapshot2b", true, true);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span> public void testReloadModifiedDirectory() throws IOException {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // don't refresh the cache unless we tell it to<a name="line.109"></a>
+<span class="sourceLineNo">110</span> long period = Long.MAX_VALUE;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.111"></a>
+<span class="sourceLineNo">112</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> createAndTestSnapshotV1(cache, "snapshot1", false, true);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> // now delete the snapshot and add a file with a different name<a name="line.115"></a>
+<span class="sourceLineNo">116</span> createAndTestSnapshotV1(cache, "snapshot1", false, false);<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> createAndTestSnapshotV2(cache, "snapshot2", false, true);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> // now delete the snapshot and add a file with a different name<a name="line.119"></a>
+<span class="sourceLineNo">120</span> createAndTestSnapshotV2(cache, "snapshot2", false, false);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @Test<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void testSnapshotTempDirReload() throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> long period = Long.MAX_VALUE;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> // This doesn't refresh cache until we invoke it explicitly<a name="line.126"></a>
+<span class="sourceLineNo">127</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.127"></a>
+<span class="sourceLineNo">128</span> "test-snapshot-file-cache-refresh", new SnapshotFiles());<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> // Add a new non-tmp snapshot<a name="line.130"></a>
+<span class="sourceLineNo">131</span> createAndTestSnapshotV1(cache, "snapshot0v1", false, false);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> createAndTestSnapshotV1(cache, "snapshot0v2", false, false);<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> // Add a new tmp snapshot<a name="line.134"></a>
+<span class="sourceLineNo">135</span> createAndTestSnapshotV2(cache, "snapshot1", true, false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> // Add another tmp snapshot<a name="line.137"></a>
+<span class="sourceLineNo">138</span> createAndTestSnapshotV2(cache, "snapshot2", true, false);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> @Test<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public void testWeNeverCacheTmpDirAndLoadIt() throws Exception {<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> final AtomicInteger count = new AtomicInteger(0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> // don't refresh the cache unless we tell it to<a name="line.145"></a>
+<span class="sourceLineNo">146</span> long period = Long.MAX_VALUE;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> SnapshotFileCache cache = new SnapshotFileCache(fs, rootDir, period, 10000000,<a name="line.147"></a>
+<span class="sourceLineNo">148</span> "test-snapshot-file-cache-refresh", new SnapshotFiles()) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span> List<String> getSnapshotsInProgress(final SnapshotManager snapshotManager)<a name="line.150"></a>
+<span class="sourceLineNo">151</span> throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> List<String> result = super.getSnapshotsInProgress(snapshotManager);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> count.incrementAndGet();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return result;<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> @Override public void triggerCacheRefreshForTesting() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> super.triggerCacheRefreshForTesting();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> };<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> SnapshotMock.SnapshotBuilder complete =<a name="line.162"></a>
+<span class="sourceLineNo">163</span> createAndTestSnapshotV1(cache, "snapshot", false, false);<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> int countBeforeCheck = count.get();<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.167"></a>
<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> int countBeforeCheck = count.get();<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> List<FileStatus> allStoreFiles = getStoreFilesForSnapshot(complete);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> Iterable<FileStatus> deletableFiles = cache.getUnreferencedFiles(allStoreFiles, null);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> assertTrue(Iterables.isEmpty(deletableFiles));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // no need for tmp dir check as all files are accounted for.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> assertEquals(0, count.get() - countBeforeCheck);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> // add a random file to make sure we refresh<a name="line.180"></a>
-<span class="sourceLineNo">181</span> FileStatus randomFile = mockStoreFile(UTIL.getRandomUUID().toString());<a name="line.181"></a>
-<span class="sourceLineNo">182</span> allStoreFiles.add(randomFile);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> deletableFiles = cache.getUnreferencedFiles(allStoreFiles, null);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> assertEquals(randomFile, Iterables.getOnlyElement(deletableFiles));<a name="line.184"></a>
-<span class="sourceLineNo">185</span> assertEquals(1, count.get() - countBeforeCheck); // we check the tmp directory<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> private List<FileStatus> getStoreFilesForSnapshot(SnapshotMock.SnapshotBuilder builder)<a name="line.188"></a>
-<span class="sourceLineNo">189</span> throws IOException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> final List<FileStatus> allStoreFiles = Lists.newArrayList();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> SnapshotReferenceUtil<a name="line.191"></a>
-<span class="sourceLineNo">192</span> .visitReferencedFiles(UTIL.getConfiguration(), fs, builder.getSnapshotsDir(),<a name="line.192"></a>
-<span class="sourceLineNo">193</span> new SnapshotReferenceUtil.SnapshotVisitor() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> @Override public void storeFile(RegionInfo regionInfo, String familyName,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> SnapshotProtos.SnapshotRegionManifest.StoreFile storeFile) throws IOException {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> FileStatus status = mockStoreFile(storeFile.getName());<a name="line.196"></a>
-<span class="sourceLineNo">197</span> allStoreFiles.add(status);<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> return allStoreFiles;<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> private FileStatus mockStoreFile(String storeFileName) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> FileStatus status = mock(FileStatus.class);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Path path = mock(Path.class);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> when(path.getName()).thenReturn(storeFileName);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> when(status.getPath()).thenReturn(path);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return status;<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> class SnapshotFiles implements SnapshotFileCache.SnapshotFileInspector {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> @Override<a name="line.212"></a>
-<span class="sourceLineNo">213</span> public Collection<String> filesUnderSnapshot(final Path snapshotDir) throws IOException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> Collection<String> files = new HashSet<>();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> files.addAll(SnapshotReferenceUtil.getHFileNames(UTIL.getConfiguration(), fs, snapshotDir));<a name="line.215"></a>
-<span class="sourceLineNo">216</span> return files;<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><a name="line.219"></a>
-<span class="sourceLineNo">220</span> private SnapshotMock.SnapshotBuilder createAndTestSnapshotV1(final SnapshotFileCache cache,<a name="line.220"></a>
-<span class="sourceLineNo">221</span> final String name, final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> SnapshotMock snapshotMock = new SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV1(name, name);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> createAndTestSnapshot(cache, builder, tmp, removeOnExit);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return builder;<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> private void createAndTestSnapshotV2(final SnapshotFileCache cache, final String name,<a name="line.228"></a>
-<span class="sourceLineNo">229</span> final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> SnapshotMock snapshotMock = new SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV2(name, name);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> createAndTestSnapshot(cache, builder, tmp, removeOnExit);<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> private void createAndTestSnapshot(final SnapshotFileCache cache,<a name="line.235"></a>
-<span class="sourceLineNo">236</span> final SnapshotMock.SnapshotBuilder builder,<a name="line.236"></a>
-<span class="sourceLineNo">237</span> final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> List<Path> files = new ArrayList<>();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> for (int i = 0; i < 3; ++i) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> for (Path filePath: builder.addRegion()) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> String fileName = filePath.getName();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (tmp) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> // We should be able to find all the files while the snapshot creation is in-progress<a name="line.243"></a>
-<span class="sourceLineNo">244</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> Iterable<FileStatus> nonSnapshot = getNonSnapshotFiles(cache, filePath);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assertFalse("Cache didn't find " + fileName, Iterables.contains(nonSnapshot, fileName));<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> files.add(filePath);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">169</span> List<FileStatus> allStoreFiles = getStoreFilesForSnapshot(complete);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Iterable<FileStatus> deletableFiles = cache.getUnreferencedFiles(allStoreFiles, null);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertTrue(Iterables.isEmpty(deletableFiles));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // no need for tmp dir check as all files are accounted for.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> assertEquals(0, count.get() - countBeforeCheck);<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> // add a random file to make sure we refresh<a name="line.176"></a>
+<span class="sourceLineNo">177</span> FileStatus randomFile = mockStoreFile(UTIL.getRandomUUID().toString());<a name="line.177"></a>
+<span class="sourceLineNo">178</span> allStoreFiles.add(randomFile);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> deletableFiles = cache.getUnreferencedFiles(allStoreFiles, null);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> assertEquals(randomFile, Iterables.getOnlyElement(deletableFiles));<a name="line.180"></a>
+<span class="sourceLineNo">181</span> assertEquals(1, count.get() - countBeforeCheck); // we check the tmp directory<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> private List<FileStatus> getStoreFilesForSnapshot(SnapshotMock.SnapshotBuilder builder)<a name="line.184"></a>
+<span class="sourceLineNo">185</span> throws IOException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> final List<FileStatus> allStoreFiles = Lists.newArrayList();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> SnapshotReferenceUtil<a name="line.187"></a>
+<span class="sourceLineNo">188</span> .visitReferencedFiles(UTIL.getConfiguration(), fs, builder.getSnapshotsDir(),<a name="line.188"></a>
+<span class="sourceLineNo">189</span> new SnapshotReferenceUtil.SnapshotVisitor() {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> @Override public void storeFile(RegionInfo regionInfo, String familyName,<a name="line.190"></a>
+<span class="sourceLineNo">191</span> SnapshotProtos.SnapshotRegionManifest.StoreFile storeFile) throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> FileStatus status = mockStoreFile(storeFile.getName());<a name="line.192"></a>
+<span class="sourceLineNo">193</span> allStoreFiles.add(status);<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> return allStoreFiles;<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> private FileStatus mockStoreFile(String storeFileName) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> FileStatus status = mock(FileStatus.class);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> Path path = mock(Path.class);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> when(path.getName()).thenReturn(storeFileName);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> when(status.getPath()).thenReturn(path);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return status;<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> class SnapshotFiles implements SnapshotFileCache.SnapshotFileInspector {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public Collection<String> filesUnderSnapshot(final Path snapshotDir) throws IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Collection<String> files = new HashSet<>();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> files.addAll(SnapshotReferenceUtil.getHFileNames(UTIL.getConfiguration(), fs, snapshotDir));<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return files;<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><a name="line.215"></a>
+<span class="sourceLineNo">216</span> private SnapshotMock.SnapshotBuilder createAndTestSnapshotV1(final SnapshotFileCache cache,<a name="line.216"></a>
+<span class="sourceLineNo">217</span> final String name, final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> SnapshotMock snapshotMock = new SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV1(name, name);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> createAndTestSnapshot(cache, builder, tmp, removeOnExit);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return builder;<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 void createAndTestSnapshotV2(final SnapshotFileCache cache, final String name,<a name="line.224"></a>
+<span class="sourceLineNo">225</span> final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> SnapshotMock snapshotMock = new SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV2(name, name);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> createAndTestSnapshot(cache, builder, tmp, removeOnExit);<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> private void createAndTestSnapshot(final SnapshotFileCache cache,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> final SnapshotMock.SnapshotBuilder builder,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> final boolean tmp, final boolean removeOnExit) throws IOException {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> List<Path> files = new ArrayList<>();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> for (int i = 0; i < 3; ++i) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> for (Path filePath: builder.addRegion()) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> if (tmp) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> // We should be able to find all the files while the snapshot creation is in-progress<a name="line.238"></a>
+<span class="sourceLineNo">239</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> assertFalse("Cache didn't find " + filePath,<a name="line.240"></a>
+<span class="sourceLineNo">241</span> contains(getNonSnapshotFiles(cache, filePath), filePath));<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> files.add(filePath);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // Finalize the snapshot<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (!tmp) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> builder.commit();<a name="line.249"></a>
<span class="sourceLineNo">250</span> }<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> // Finalize the snapshot<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (!tmp) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> builder.commit();<a name="line.254"></a>
+<span class="sourceLineNo">252</span> // Make sure that all files are still present<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (Path path: files) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> assertFalse("Cache didn't find " + path, contains(getNonSnapshotFiles(cache, path), path));<a name="line.254"></a>
<span class="sourceLineNo">255</span> }<a name="line.255"></a>
<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // Make sure that all files are still present<a name="line.257"></a>
-<span class="sourceLineNo">258</span> for (Path path: files) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> Iterable<FileStatus> nonSnapshotFiles = getNonSnapshotFiles(cache, path);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> assertFalse("Cache didn't find " + path.getName(),<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Iterables.contains(nonSnapshotFiles, path.getName()));<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> if (removeOnExit) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> LOG.debug("Deleting snapshot.");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> fs.delete(builder.getSnapshotsDir(), true);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.268"></a>
+<span class="sourceLineNo">257</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (removeOnExit) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> LOG.debug("Deleting snapshot.");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> fs.delete(builder.getSnapshotsDir(), true);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> FSUtils.logFileSystemState(fs, rootDir, LOG);<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> // then trigger a refresh<a name="line.263"></a>
+<span class="sourceLineNo">264</span> cache.triggerCacheRefreshForTesting();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> // and not it shouldn't find those files<a name="line.265"></a>
+<span class="sourceLineNo">266</span> for (Path filePath: files) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> assertTrue("Cache found '" + filePath + "', but it shouldn't have.",<a name="line.267"></a>
+<span class="sourceLineNo">268</span> contains(getNonSnapshotFiles(cache, filePath), filePath));<a name="line.268"></a>
<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> // The files should be in cache until next refresh<a name="line.270"></a>
-<span class="sourceLineNo">271</span> for (Path filePath: files) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Iterable<FileStatus> nonSnapshotFiles = getNonSnapshotFiles(cache, filePath);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertFalse("Cache didn't find " + filePath.getName(), Iterables.contains(nonSnapshotFiles,<a name="line.273"></a>
-<span class="sourceLineNo">274</span> filePath.getName()));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> // then trigger a refresh<a name="line.277"></a>
-<span class="sourceLineNo">278</span> cache.triggerCacheRefreshForTesting();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // and not it shouldn't find those files<a name="line.279"></a>
-<span class="sourceLineNo">280</span> for (Path filePath: files) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Iterable<FileStatus> nonSnapshotFiles = getNonSnapshotFiles(cache, filePath);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> assertTrue("Cache found '" + filePath.getName() + "', but it shouldn't have.",<a name="line.282"></a>
-<span class="sourceLineNo">283</span> !Iterables.contains(nonSnapshotFiles, filePath.getName()));<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> private Iterable<FileStatus> getNonSnapshotFiles(SnapshotFileCache cache, Path storeFile)<a name="line.288"></a>
-<span class="sourceLineNo">289</span> throws IOException {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return cache.getUnreferencedFiles(<a name="line.290"></a>
-<span class="sourceLineNo">291</span> Arrays.asList(FSUtils.listStatus(fs, storeFile.getParent())), null<a name="line.291"></a>
-<span class="sourceLineNo">292</span> );<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>}<a name="line.294"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<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> private static boolean contains(Iterable<FileStatus> files, Path filePath) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> for (FileStatus status: files) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> LOG.debug("debug in contains, 3.1: " + status.getPath() + " filePath:" + filePath);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (filePath.equals(status.getPath())) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return true;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> return false;<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> private static Iterable<FileStatus> getNonSnapshotFiles(SnapshotFileCache cache, Path storeFile)<a name="line.284"></a>
+<span class="sourceLineNo">285</span> throws IOException {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return cache.getUnreferencedFiles(<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Arrays.asList(FSUtils.listStatus(fs, storeFile.getParent())), null<a name="line.287"></a>
+<span class="sourceLineNo">288</span> );<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span>}<a name="line.290"></a>