Repository: hbase-site
Updated Branches:
  refs/heads/asf-site dada90184 -> 66c38917b


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/66c38917/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
index c67d2a7..6d373f8 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
@@ -255,134 +255,153 @@
 <span class="sourceLineNo">247</span><a name="line.247"></a>
 <span class="sourceLineNo">248</span>  @Test<a name="line.248"></a>
 <span class="sourceLineNo">249</span>  public void testCloneSnapshotOfCloned() 
throws IOException, InterruptedException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    TableName clonedTableName = 
TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>    admin.cloneSnapshot(snapshotName0, 
clonedTableName);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    verifyRowCount(TEST_UTIL, 
clonedTableName, snapshot0Rows);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, 
getNumReplicas());<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    
admin.disableTable(clonedTableName);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    admin.snapshot(snapshotName2, 
clonedTableName);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    
TEST_UTIL.deleteTable(clonedTableName);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    waitCleanerRun();<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    admin.cloneSnapshot(snapshotName2, 
clonedTableName);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    verifyRowCount(TEST_UTIL, 
clonedTableName, snapshot0Rows);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, 
getNumReplicas());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    
TEST_UTIL.deleteTable(clonedTableName);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>  }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>  @Test<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  public void 
testCloneAndRestoreSnapshot() throws IOException, InterruptedException {<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    TEST_UTIL.deleteTable(tableName);<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>    waitCleanerRun();<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    admin.cloneSnapshot(snapshotName0, 
tableName);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot0Rows);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    waitCleanerRun();<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    admin.disableTable(tableName);<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>    
admin.restoreSnapshot(snapshotName0);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    admin.enableTable(tableName);<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot0Rows);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<a name="line.279"></a>
-<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>  @Test<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public void testCorruptedSnapshot() 
throws IOException, InterruptedException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    
SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, 
Bytes.toString(snapshotName0));<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    TableName cloneName = 
TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>    try {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      admin.cloneSnapshot(snapshotName0, 
cloneName);<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      fail("Expected 
CorruptedSnapshotException, got succeeded cloneSnapshot()");<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    } catch (CorruptedSnapshotException 
e) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      // Got the expected corruption 
exception.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      // check for no references of the 
cloned table.<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      
assertFalse(admin.tableExists(cloneName));<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    } catch (Exception e) {<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>      fail("Expected 
CorruptedSnapshotException got: " + e);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>  @Test<a name="line.298"></a>
-<span class="sourceLineNo">299</span>  public void 
testRestoreSnapshotAfterSplittingRegions() throws IOException, 
InterruptedException {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    List&lt;RegionInfo&gt; regionInfos = 
admin.getRegions(tableName);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    
RegionReplicaUtil.removeNonDefaultRegions(regionInfos);<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>    // Split the first region<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>    splitRegion(regionInfos.get(0));<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    // Take a snapshot<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    admin.snapshot(snapshotName1, 
tableName);<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>    // Load more data<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>    
SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>    // Split the second region<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>    splitRegion(regionInfos.get(1));<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    // Restore the snapshot<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>    admin.disableTable(tableName);<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>    
admin.restoreSnapshot(snapshotName1);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    admin.enableTable(tableName);<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot1Rows);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>  @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span>  public void 
testRestoreSnapshotAfterTruncate() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    TableName tableName = 
TableName.valueOf("testRestoreSnapshotAfterTruncate");<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    
SnapshotTestingUtils.createTable(TEST_UTIL, tableName, getNumReplicas(), 
FAMILY);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    
SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    int numOfRows = 0;<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>    try (Table table = 
TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      numOfRows = countRows(table);<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    // take snapshot<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>    admin.snapshot("snap", tableName);<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>    admin.disableTable(tableName);<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    admin.truncateTable(tableName, 
false);<a name="line.336"></a>
+<span class="sourceLineNo">250</span>    TableName clonedTableName = 
TableName.valueOf(name.getMethodName() + "-" +<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      System.currentTimeMillis());<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>    admin.cloneSnapshot(snapshotName0, 
clonedTableName);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    verifyRowCount(TEST_UTIL, 
clonedTableName, snapshot0Rows);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, 
getNumReplicas());<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    
admin.disableTable(clonedTableName);<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    admin.snapshot(snapshotName2, 
clonedTableName);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    
TEST_UTIL.deleteTable(clonedTableName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    waitCleanerRun();<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>    admin.cloneSnapshot(snapshotName2, 
clonedTableName);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    verifyRowCount(TEST_UTIL, 
clonedTableName, snapshot0Rows);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, 
getNumReplicas());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    
TEST_UTIL.deleteTable(clonedTableName);<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>  @Test<a name="line.266"></a>
+<span class="sourceLineNo">267</span>  public void 
testCloneAndRestoreSnapshot() throws IOException, InterruptedException {<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    TEST_UTIL.deleteTable(tableName);<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>    waitCleanerRun();<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    admin.cloneSnapshot(snapshotName0, 
tableName);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot0Rows);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    waitCleanerRun();<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    admin.disableTable(tableName);<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>    
admin.restoreSnapshot(snapshotName0);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    admin.enableTable(tableName);<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot0Rows);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<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>  @Test<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  public void testCorruptedSnapshot() 
throws IOException, InterruptedException {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    
SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, 
Bytes.toString(snapshotName0));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    TableName cloneName = 
TableName.valueOf(name.getMethodName() + "-" +<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      System.currentTimeMillis());<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>    try {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      admin.cloneSnapshot(snapshotName0, 
cloneName);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      fail("Expected 
CorruptedSnapshotException, got succeeded cloneSnapshot()");<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>    } catch (CorruptedSnapshotException 
e) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      // Got the expected corruption 
exception.<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      // check for no references of the 
cloned table.<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      
assertFalse(admin.tableExists(cloneName));<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    } catch (Exception e) {<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      fail("Expected 
CorruptedSnapshotException got: " + e);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>  @Test<a name="line.300"></a>
+<span class="sourceLineNo">301</span>  public void 
testRestoreSnapshotAfterSplittingRegions() throws IOException, 
InterruptedException {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    List&lt;RegionInfo&gt; regionInfos = 
admin.getRegions(tableName);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    
RegionReplicaUtil.removeNonDefaultRegions(regionInfos);<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>    // Split the first region<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>    splitRegion(regionInfos.get(0));<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>    // Take a snapshot<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    admin.snapshot(snapshotName1, 
tableName);<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span>    // Load more data<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    
SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>    // Split the second region<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    splitRegion(regionInfos.get(1));<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    // Restore the snapshot<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>    admin.disableTable(tableName);<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>    
admin.restoreSnapshot(snapshotName1);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    admin.enableTable(tableName);<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>    verifyRowCount(TEST_UTIL, tableName, 
snapshot1Rows);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>  @Test<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  public void 
testRestoreSnapshotAfterTruncate() throws Exception {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    TableName tableName = 
TableName.valueOf("testRestoreSnapshotAfterTruncate");<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    
SnapshotTestingUtils.createTable(TEST_UTIL, tableName, getNumReplicas(), 
FAMILY);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    
SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    int numOfRows = 0;<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    try (Table table = 
TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      numOfRows = countRows(table);<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    // take snapshot<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>    admin.snapshot("snap", tableName);<a 
name="line.336"></a>
 <span class="sourceLineNo">337</span>    admin.disableTable(tableName);<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>    admin.restoreSnapshot("snap");<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    admin.enableTable(tableName);<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>    verifyRowCount(TEST_UTIL, tableName, 
numOfRows);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<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>  //  Helpers<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  // 
==========================================================================<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>  private void waitCleanerRun() throws 
InterruptedException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    
TEST_UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().choreForTesting();<a
 name="line.349"></a>
-<span class="sourceLineNo">350</span>  }<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span>  private Set&lt;String&gt; 
getFamiliesFromFS(final TableName tableName) throws IOException {<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>    MasterFileSystem mfs = 
TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    Set&lt;String&gt; families = new 
HashSet&lt;&gt;();<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    Path tableDir = 
FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    for (Path regionDir: 
FSUtils.getRegionDirs(mfs.getFileSystem(), tableDir)) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      for (Path familyDir: 
FSUtils.getFamilyDirs(mfs.getFileSystem(), regionDir)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        
families.add(familyDir.getName());<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>    return families;<a 
name="line.361"></a>
+<span class="sourceLineNo">338</span>    admin.truncateTable(tableName, 
false);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    admin.disableTable(tableName);<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>    admin.restoreSnapshot("snap");<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>    admin.enableTable(tableName);<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    verifyRowCount(TEST_UTIL, tableName, 
numOfRows);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, 
getNumReplicas());<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>  @Test(timeout = 30000)<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>  public void 
testGetCompactionStateAfterRestoringSnapshot() throws IOException,<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    InterruptedException {<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    // Take a snapshot<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>    admin.snapshot(snapshotName1, 
tableName);<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>    // Restore the snapshot<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>    admin.disableTable(tableName);<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>    
admin.restoreSnapshot(snapshotName1);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>    // Get the compaction state of the 
restored table<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    CompactionState compactionState = 
admin.getCompactionState(tableName);<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span>    // The compactionState should be NONE 
because the table is disabled<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    assertEquals(CompactionState.NONE, 
compactionState);<a name="line.361"></a>
 <span class="sourceLineNo">362</span>  }<a name="line.362"></a>
 <span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>  protected void verifyRowCount(final 
HBaseTestingUtility util, final TableName tableName,<a name="line.364"></a>
-<span class="sourceLineNo">365</span>      long expectedRows) throws 
IOException {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    
SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>  }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>  protected int countRows(final Table 
table, final byte[]... families) throws IOException {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    return TEST_UTIL.countRows(table, 
families);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>  }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>  protected void splitRegion(final 
RegionInfo regionInfo) throws IOException {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    byte[][] splitPoints = 
Bytes.split(regionInfo.getStartKey(), regionInfo.getEndKey(), 1);<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>    admin.split(regionInfo.getTable(), 
splitPoints[1]);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>  }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>}<a name="line.377"></a>
+<span class="sourceLineNo">364</span>  // 
==========================================================================<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>  //  Helpers<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  // 
==========================================================================<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>  private void waitCleanerRun() throws 
InterruptedException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    
TEST_UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().choreForTesting();<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>  private Set&lt;String&gt; 
getFamiliesFromFS(final TableName tableName) throws IOException {<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    MasterFileSystem mfs = 
TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>    Set&lt;String&gt; families = new 
HashSet&lt;&gt;();<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    Path tableDir = 
FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    for (Path regionDir: 
FSUtils.getRegionDirs(mfs.getFileSystem(), tableDir)) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      for (Path familyDir: 
FSUtils.getFamilyDirs(mfs.getFileSystem(), regionDir)) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>        
families.add(familyDir.getName());<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      }<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    }<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    return families;<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>  protected void verifyRowCount(final 
HBaseTestingUtility util, final TableName tableName,<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      long expectedRows) throws 
IOException {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    
SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>  }<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span>  protected int countRows(final Table 
table, final byte[]... families) throws IOException {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    return TEST_UTIL.countRows(table, 
families);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span>  protected void splitRegion(final 
RegionInfo regionInfo) throws IOException {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    byte[][] splitPoints = 
Bytes.split(regionInfo.getStartKey(), regionInfo.getEndKey(), 1);<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>    admin.split(regionInfo.getTable(), 
splitPoints[1]);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>}<a name="line.396"></a>
 
 
 

Reply via email to