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/07/28 14:49:10 UTC
[05/11] hbase-site git commit: Published site at
e963694259aa9242aa709e9b954754abd9a681cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
index bbbf2a1..4153319 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
@@ -244,279 +244,280 @@
<span class="sourceLineNo">236</span> Path tableInfoPath = null;<a name="line.236"></a>
<span class="sourceLineNo">237</span><a name="line.237"></a>
<span class="sourceLineNo">238</span> // can't build the path directly as the timestamp values are different<a name="line.238"></a>
-<span class="sourceLineNo">239</span> FileStatus[] snapshots = fs.listStatus(tableSnapShotPath);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> for (FileStatus snapshot : snapshots) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> tableInfoPath = snapshot.getPath();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> // SnapshotManifest.DATA_MANIFEST_NAME = "data.manifest";<a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (tableInfoPath.getName().endsWith("data.manifest")) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> break;<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> return tableInfoPath;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * Get table descriptor<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @param tableName is the table backed up<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @return {@link TableDescriptor} saved in backup image of the table<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> TableDescriptor getTableDesc(TableName tableName) throws IOException {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Path tableInfoPath = this.getTableInfoPath(tableName);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> SnapshotDescription desc = SnapshotDescriptionUtils.readSnapshotInfo(fs, tableInfoPath);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> SnapshotManifest manifest = SnapshotManifest.open(conf, fs, tableInfoPath, desc);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> TableDescriptor tableDescriptor = manifest.getTableDescriptor();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (!tableDescriptor.getTableName().equals(tableName)) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> LOG.error("couldn't find Table Desc for table: " + tableName + " under tableInfoPath: "<a name="line.261"></a>
-<span class="sourceLineNo">262</span> + tableInfoPath.toString());<a name="line.262"></a>
-<span class="sourceLineNo">263</span> LOG.error("tableDescriptor.getNameAsString() = "<a name="line.263"></a>
-<span class="sourceLineNo">264</span> + tableDescriptor.getTableName().getNameAsString());<a name="line.264"></a>
-<span class="sourceLineNo">265</span> throw new FileNotFoundException("couldn't find Table Desc for table: " + tableName<a name="line.265"></a>
-<span class="sourceLineNo">266</span> + " under tableInfoPath: " + tableInfoPath.toString());<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return tableDescriptor;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> private TableDescriptor getTableDescriptor(FileSystem fileSys, TableName tableName,<a name="line.271"></a>
-<span class="sourceLineNo">272</span> String lastIncrBackupId) throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (lastIncrBackupId != null) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> String target =<a name="line.274"></a>
-<span class="sourceLineNo">275</span> BackupUtils.getTableBackupDir(backupRootPath.toString(),<a name="line.275"></a>
-<span class="sourceLineNo">276</span> lastIncrBackupId, tableName);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return FSTableDescriptors.getTableDescriptorFromFs(fileSys, new Path(target));<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return null;<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> private void createAndRestoreTable(Connection conn, TableName tableName, TableName newTableName,<a name="line.282"></a>
-<span class="sourceLineNo">283</span> Path tableBackupPath, boolean truncateIfExists, String lastIncrBackupId) throws IOException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (newTableName == null) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> newTableName = tableName;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span> FileSystem fileSys = tableBackupPath.getFileSystem(this.conf);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> // get table descriptor first<a name="line.289"></a>
-<span class="sourceLineNo">290</span> TableDescriptor tableDescriptor = getTableDescriptor(fileSys, tableName, lastIncrBackupId);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (tableDescriptor != null) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> LOG.debug("Retrieved descriptor: " + tableDescriptor + " thru " + lastIncrBackupId);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (tableDescriptor == null) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Path tableSnapshotPath = getTableSnapshotPath(backupRootPath, tableName, backupId);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if (fileSys.exists(tableSnapshotPath)) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // snapshot path exist means the backup path is in HDFS<a name="line.298"></a>
-<span class="sourceLineNo">299</span> // check whether snapshot dir already recorded for target table<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (snapshotMap.get(tableName) != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> SnapshotDescription desc =<a name="line.301"></a>
-<span class="sourceLineNo">302</span> SnapshotDescriptionUtils.readSnapshotInfo(fileSys, tableSnapshotPath);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> SnapshotManifest manifest = SnapshotManifest.open(conf, fileSys, tableSnapshotPath, desc);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> tableDescriptor = manifest.getTableDescriptor();<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } else {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> tableDescriptor = getTableDesc(tableName);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> snapshotMap.put(tableName, getTableInfoPath(tableName));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> if (tableDescriptor == null) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> LOG.debug("Found no table descriptor in the snapshot dir, previous schema would be lost");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> } else {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> throw new IOException("Table snapshot directory: " +<a name="line.313"></a>
-<span class="sourceLineNo">314</span> tableSnapshotPath + " does not exist.");<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> Path tableArchivePath = getTableArchivePath(tableName);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> if (tableArchivePath == null) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (tableDescriptor != null) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // find table descriptor but no archive dir means the table is empty, create table and exit<a name="line.321"></a>
-<span class="sourceLineNo">322</span> if (LOG.isDebugEnabled()) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> LOG.debug("find table descriptor but no archive dir for table " + tableName<a name="line.323"></a>
-<span class="sourceLineNo">324</span> + ", will only create table");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> tableDescriptor = TableDescriptorBuilder.copy(newTableName, tableDescriptor);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> checkAndCreateTable(conn, tableBackupPath, tableName, newTableName, null, tableDescriptor,<a name="line.327"></a>
-<span class="sourceLineNo">328</span> truncateIfExists);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> return;<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> throw new IllegalStateException("Cannot restore hbase table because directory '"<a name="line.331"></a>
-<span class="sourceLineNo">332</span> + " tableArchivePath is null.");<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> if (tableDescriptor == null) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> tableDescriptor = TableDescriptorBuilder.newBuilder(newTableName).build();<a name="line.337"></a>
-<span class="sourceLineNo">338</span> } else {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> tableDescriptor = TableDescriptorBuilder.copy(newTableName, tableDescriptor);<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> // record all region dirs:<a name="line.342"></a>
-<span class="sourceLineNo">343</span> // load all files in dir<a name="line.343"></a>
-<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> ArrayList<Path> regionPathList = getRegionList(tableName);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> // should only try to create the table with all region informations, so we could pre-split<a name="line.347"></a>
-<span class="sourceLineNo">348</span> // the regions in fine grain<a name="line.348"></a>
-<span class="sourceLineNo">349</span> checkAndCreateTable(conn, tableBackupPath, tableName, newTableName, regionPathList,<a name="line.349"></a>
-<span class="sourceLineNo">350</span> tableDescriptor, truncateIfExists);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> RestoreJob restoreService = BackupRestoreFactory.getRestoreJob(conf);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> Path[] paths = new Path[regionPathList.size()];<a name="line.352"></a>
-<span class="sourceLineNo">353</span> regionPathList.toArray(paths);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> restoreService.run(paths, new TableName[]{tableName}, new TableName[] {newTableName}, true);<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> } catch (Exception e) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> LOG.error(e.toString(), e);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> throw new IllegalStateException("Cannot restore hbase table", e);<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> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * Gets region list<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @param tableArchivePath table archive path<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * @return RegionList region list<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @throws IOException exception<a name="line.366"></a>
-<span class="sourceLineNo">367</span> */<a name="line.367"></a>
-<span class="sourceLineNo">368</span> ArrayList<Path> getRegionList(Path tableArchivePath) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> ArrayList<Path> regionDirList = new ArrayList<>();<a name="line.369"></a>
-<span class="sourceLineNo">370</span> FileStatus[] children = fs.listStatus(tableArchivePath);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> for (FileStatus childStatus : children) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> // here child refer to each region(Name)<a name="line.372"></a>
-<span class="sourceLineNo">373</span> Path child = childStatus.getPath();<a name="line.373"></a>
-<span class="sourceLineNo">374</span> regionDirList.add(child);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return regionDirList;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<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> * Calculate region boundaries and add all the column families to the table descriptor<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @param regionDirList region dir list<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return a set of keys to store the boundaries<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> byte[][] generateBoundaryKeys(ArrayList<Path> regionDirList) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> TreeMap<byte[], Integer> map = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> // Build a set of keys to store the boundaries<a name="line.386"></a>
-<span class="sourceLineNo">387</span> // calculate region boundaries and add all the column families to the table descriptor<a name="line.387"></a>
-<span class="sourceLineNo">388</span> for (Path regionDir : regionDirList) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> LOG.debug("Parsing region dir: " + regionDir);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> Path hfofDir = regionDir;<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> if (!fs.exists(hfofDir)) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> LOG.warn("HFileOutputFormat dir " + hfofDir + " not found");<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> FileStatus[] familyDirStatuses = fs.listStatus(hfofDir);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> if (familyDirStatuses == null) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> throw new IOException("No families found in " + hfofDir);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> for (FileStatus stat : familyDirStatuses) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (!stat.isDirectory()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> LOG.warn("Skipping non-directory " + stat.getPath());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> continue;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> boolean isIgnore = false;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String pathName = stat.getPath().getName();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> for (String ignore : ignoreDirs) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (pathName.contains(ignore)) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> LOG.warn("Skipping non-family directory" + pathName);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> isIgnore = true;<a name="line.411"></a>
-<span class="sourceLineNo">412</span> break;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if (isIgnore) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> continue;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> Path familyDir = stat.getPath();<a name="line.418"></a>
-<span class="sourceLineNo">419</span> LOG.debug("Parsing family dir [" + familyDir.toString() + " in region [" + regionDir + "]");<a name="line.419"></a>
-<span class="sourceLineNo">420</span> // Skip _logs, etc<a name="line.420"></a>
-<span class="sourceLineNo">421</span> if (familyDir.getName().startsWith("_") || familyDir.getName().startsWith(".")) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> continue;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> // start to parse hfile inside one family dir<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));<a name="line.426"></a>
-<span class="sourceLineNo">427</span> for (Path hfile : hfiles) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> if (hfile.getName().startsWith("_") || hfile.getName().startsWith(".")<a name="line.428"></a>
-<span class="sourceLineNo">429</span> || StoreFileInfo.isReference(hfile.getName())<a name="line.429"></a>
-<span class="sourceLineNo">430</span> || HFileLink.isHFileLink(hfile.getName())) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> continue;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span> HFile.Reader reader = HFile.createReader(fs, hfile, conf);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> final byte[] first, last;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> try {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> reader.loadFileInfo();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> first = reader.getFirstRowKey().get();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> last = reader.getLastRowKey().get();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.debug("Trying to figure out region boundaries hfile=" + hfile + " first="<a name="line.439"></a>
-<span class="sourceLineNo">440</span> + Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> // To eventually infer start key-end key boundaries<a name="line.442"></a>
-<span class="sourceLineNo">443</span> Integer value = map.containsKey(first) ? (Integer) map.get(first) : 0;<a name="line.443"></a>
-<span class="sourceLineNo">444</span> map.put(first, value + 1);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> value = map.containsKey(last) ? (Integer) map.get(last) : 0;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> map.put(last, value - 1);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> } finally {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> reader.close();<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> return LoadIncrementalHFiles.inferBoundaries(map);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * Prepare the table for bulkload, most codes copied from<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * {@link LoadIncrementalHFiles#createTable(TableName, String, Admin)}<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @param conn connection<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @param tableBackupPath path<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * @param tableName table name<a name="line.461"></a>
-<span class="sourceLineNo">462</span> * @param targetTableName target table name<a name="line.462"></a>
-<span class="sourceLineNo">463</span> * @param regionDirList region directory list<a name="line.463"></a>
-<span class="sourceLineNo">464</span> * @param htd table descriptor<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * @param truncateIfExists truncates table if exists<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @throws IOException exception<a name="line.466"></a>
-<span class="sourceLineNo">467</span> */<a name="line.467"></a>
-<span class="sourceLineNo">468</span> private void checkAndCreateTable(Connection conn, Path tableBackupPath, TableName tableName,<a name="line.468"></a>
-<span class="sourceLineNo">469</span> TableName targetTableName, ArrayList<Path> regionDirList, TableDescriptor htd,<a name="line.469"></a>
-<span class="sourceLineNo">470</span> boolean truncateIfExists) throws IOException {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> try (Admin admin = conn.getAdmin()) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> boolean createNew = false;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> if (admin.tableExists(targetTableName)) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (truncateIfExists) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> LOG.info("Truncating exising target table '" + targetTableName<a name="line.475"></a>
-<span class="sourceLineNo">476</span> + "', preserving region splits");<a name="line.476"></a>
-<span class="sourceLineNo">477</span> admin.disableTable(targetTableName);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> admin.truncateTable(targetTableName, true);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } else {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> LOG.info("Using exising target table '" + targetTableName + "'");<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> } else {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> createNew = true;<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (createNew) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> LOG.info("Creating target table '" + targetTableName + "'");<a name="line.486"></a>
-<span class="sourceLineNo">487</span> byte[][] keys;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> if (regionDirList == null || regionDirList.size() == 0) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span> admin.createTable(htd, null);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> } else {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> keys = generateBoundaryKeys(regionDirList);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> // create table using table descriptor and region boundaries<a name="line.492"></a>
-<span class="sourceLineNo">493</span> admin.createTable(htd, keys);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> long startTime = EnvironmentEdgeManager.currentTime();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> while (!admin.isTableAvailable(targetTableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> Thread.sleep(100);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> } catch (InterruptedException ie) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> Thread.currentThread().interrupt();<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (EnvironmentEdgeManager.currentTime() - startTime > TABLE_AVAILABILITY_WAIT_TIME) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> throw new IOException("Time out " + TABLE_AVAILABILITY_WAIT_TIME + "ms expired, table "<a name="line.505"></a>
-<span class="sourceLineNo">506</span> + targetTableName + " is still not available");<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span>}<a name="line.511"></a>
+<span class="sourceLineNo">239</span> FileStatus[] snapshots = fs.listStatus(tableSnapShotPath,<a name="line.239"></a>
+<span class="sourceLineNo">240</span> new SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter(fs));<a name="line.240"></a>
+<span class="sourceLineNo">241</span> for (FileStatus snapshot : snapshots) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> tableInfoPath = snapshot.getPath();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // SnapshotManifest.DATA_MANIFEST_NAME = "data.manifest";<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (tableInfoPath.getName().endsWith("data.manifest")) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> break;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return tableInfoPath;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * Get table descriptor<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @param tableName is the table backed up<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return {@link TableDescriptor} saved in backup image of the table<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> TableDescriptor getTableDesc(TableName tableName) throws IOException {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> Path tableInfoPath = this.getTableInfoPath(tableName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> SnapshotDescription desc = SnapshotDescriptionUtils.readSnapshotInfo(fs, tableInfoPath);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> SnapshotManifest manifest = SnapshotManifest.open(conf, fs, tableInfoPath, desc);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> TableDescriptor tableDescriptor = manifest.getTableDescriptor();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (!tableDescriptor.getTableName().equals(tableName)) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> LOG.error("couldn't find Table Desc for table: " + tableName + " under tableInfoPath: "<a name="line.262"></a>
+<span class="sourceLineNo">263</span> + tableInfoPath.toString());<a name="line.263"></a>
+<span class="sourceLineNo">264</span> LOG.error("tableDescriptor.getNameAsString() = "<a name="line.264"></a>
+<span class="sourceLineNo">265</span> + tableDescriptor.getTableName().getNameAsString());<a name="line.265"></a>
+<span class="sourceLineNo">266</span> throw new FileNotFoundException("couldn't find Table Desc for table: " + tableName<a name="line.266"></a>
+<span class="sourceLineNo">267</span> + " under tableInfoPath: " + tableInfoPath.toString());<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return tableDescriptor;<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> private TableDescriptor getTableDescriptor(FileSystem fileSys, TableName tableName,<a name="line.272"></a>
+<span class="sourceLineNo">273</span> String lastIncrBackupId) throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (lastIncrBackupId != null) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> String target =<a name="line.275"></a>
+<span class="sourceLineNo">276</span> BackupUtils.getTableBackupDir(backupRootPath.toString(),<a name="line.276"></a>
+<span class="sourceLineNo">277</span> lastIncrBackupId, tableName);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return FSTableDescriptors.getTableDescriptorFromFs(fileSys, new Path(target));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return null;<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> private void createAndRestoreTable(Connection conn, TableName tableName, TableName newTableName,<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Path tableBackupPath, boolean truncateIfExists, String lastIncrBackupId) throws IOException {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (newTableName == null) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> newTableName = tableName;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span> FileSystem fileSys = tableBackupPath.getFileSystem(this.conf);<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> // get table descriptor first<a name="line.290"></a>
+<span class="sourceLineNo">291</span> TableDescriptor tableDescriptor = getTableDescriptor(fileSys, tableName, lastIncrBackupId);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (tableDescriptor != null) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> LOG.debug("Retrieved descriptor: " + tableDescriptor + " thru " + lastIncrBackupId);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (tableDescriptor == null) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Path tableSnapshotPath = getTableSnapshotPath(backupRootPath, tableName, backupId);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> if (fileSys.exists(tableSnapshotPath)) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // snapshot path exist means the backup path is in HDFS<a name="line.299"></a>
+<span class="sourceLineNo">300</span> // check whether snapshot dir already recorded for target table<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (snapshotMap.get(tableName) != null) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> SnapshotDescription desc =<a name="line.302"></a>
+<span class="sourceLineNo">303</span> SnapshotDescriptionUtils.readSnapshotInfo(fileSys, tableSnapshotPath);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> SnapshotManifest manifest = SnapshotManifest.open(conf, fileSys, tableSnapshotPath, desc);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> tableDescriptor = manifest.getTableDescriptor();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> } else {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> tableDescriptor = getTableDesc(tableName);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> snapshotMap.put(tableName, getTableInfoPath(tableName));<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (tableDescriptor == null) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> LOG.debug("Found no table descriptor in the snapshot dir, previous schema would be lost");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> } else {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> throw new IOException("Table snapshot directory: " +<a name="line.314"></a>
+<span class="sourceLineNo">315</span> tableSnapshotPath + " does not exist.");<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> Path tableArchivePath = getTableArchivePath(tableName);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> if (tableArchivePath == null) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (tableDescriptor != null) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> // find table descriptor but no archive dir means the table is empty, create table and exit<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (LOG.isDebugEnabled()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> LOG.debug("find table descriptor but no archive dir for table " + tableName<a name="line.324"></a>
+<span class="sourceLineNo">325</span> + ", will only create table");<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span> tableDescriptor = TableDescriptorBuilder.copy(newTableName, tableDescriptor);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> checkAndCreateTable(conn, tableBackupPath, tableName, newTableName, null, tableDescriptor,<a name="line.328"></a>
+<span class="sourceLineNo">329</span> truncateIfExists);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> throw new IllegalStateException("Cannot restore hbase table because directory '"<a name="line.332"></a>
+<span class="sourceLineNo">333</span> + " tableArchivePath is null.");<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> if (tableDescriptor == null) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> tableDescriptor = TableDescriptorBuilder.newBuilder(newTableName).build();<a name="line.338"></a>
+<span class="sourceLineNo">339</span> } else {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> tableDescriptor = TableDescriptorBuilder.copy(newTableName, tableDescriptor);<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> // record all region dirs:<a name="line.343"></a>
+<span class="sourceLineNo">344</span> // load all files in dir<a name="line.344"></a>
+<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> ArrayList<Path> regionPathList = getRegionList(tableName);<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> // should only try to create the table with all region informations, so we could pre-split<a name="line.348"></a>
+<span class="sourceLineNo">349</span> // the regions in fine grain<a name="line.349"></a>
+<span class="sourceLineNo">350</span> checkAndCreateTable(conn, tableBackupPath, tableName, newTableName, regionPathList,<a name="line.350"></a>
+<span class="sourceLineNo">351</span> tableDescriptor, truncateIfExists);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> RestoreJob restoreService = BackupRestoreFactory.getRestoreJob(conf);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> Path[] paths = new Path[regionPathList.size()];<a name="line.353"></a>
+<span class="sourceLineNo">354</span> regionPathList.toArray(paths);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> restoreService.run(paths, new TableName[]{tableName}, new TableName[] {newTableName}, true);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> } catch (Exception e) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> LOG.error(e.toString(), e);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> throw new IllegalStateException("Cannot restore hbase table", e);<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><a name="line.362"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Gets region list<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @param tableArchivePath table archive path<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @return RegionList region list<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * @throws IOException exception<a name="line.367"></a>
+<span class="sourceLineNo">368</span> */<a name="line.368"></a>
+<span class="sourceLineNo">369</span> ArrayList<Path> getRegionList(Path tableArchivePath) throws IOException {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> ArrayList<Path> regionDirList = new ArrayList<>();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> FileStatus[] children = fs.listStatus(tableArchivePath);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> for (FileStatus childStatus : children) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> // here child refer to each region(Name)<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Path child = childStatus.getPath();<a name="line.374"></a>
+<span class="sourceLineNo">375</span> regionDirList.add(child);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return regionDirList;<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> /**<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * Calculate region boundaries and add all the column families to the table descriptor<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * @param regionDirList region dir list<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * @return a set of keys to store the boundaries<a name="line.383"></a>
+<span class="sourceLineNo">384</span> */<a name="line.384"></a>
+<span class="sourceLineNo">385</span> byte[][] generateBoundaryKeys(ArrayList<Path> regionDirList) throws IOException {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> TreeMap<byte[], Integer> map = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> // Build a set of keys to store the boundaries<a name="line.387"></a>
+<span class="sourceLineNo">388</span> // calculate region boundaries and add all the column families to the table descriptor<a name="line.388"></a>
+<span class="sourceLineNo">389</span> for (Path regionDir : regionDirList) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> LOG.debug("Parsing region dir: " + regionDir);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> Path hfofDir = regionDir;<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (!fs.exists(hfofDir)) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> LOG.warn("HFileOutputFormat dir " + hfofDir + " not found");<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>
+<span class="sourceLineNo">397</span> FileStatus[] familyDirStatuses = fs.listStatus(hfofDir);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (familyDirStatuses == null) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> throw new IOException("No families found in " + hfofDir);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> for (FileStatus stat : familyDirStatuses) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> if (!stat.isDirectory()) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> LOG.warn("Skipping non-directory " + stat.getPath());<a name="line.404"></a>
+<span class="sourceLineNo">405</span> continue;<a name="line.405"></a>
+<span class="sourceLineNo">406</span> }<a name="line.406"></a>
+<span class="sourceLineNo">407</span> boolean isIgnore = false;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> String pathName = stat.getPath().getName();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> for (String ignore : ignoreDirs) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> if (pathName.contains(ignore)) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> LOG.warn("Skipping non-family directory" + pathName);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> isIgnore = true;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> break;<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (isIgnore) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> continue;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span> Path familyDir = stat.getPath();<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.debug("Parsing family dir [" + familyDir.toString() + " in region [" + regionDir + "]");<a name="line.420"></a>
+<span class="sourceLineNo">421</span> // Skip _logs, etc<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (familyDir.getName().startsWith("_") || familyDir.getName().startsWith(".")) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> continue;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> // start to parse hfile inside one family dir<a name="line.426"></a>
+<span class="sourceLineNo">427</span> Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));<a name="line.427"></a>
+<span class="sourceLineNo">428</span> for (Path hfile : hfiles) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (hfile.getName().startsWith("_") || hfile.getName().startsWith(".")<a name="line.429"></a>
+<span class="sourceLineNo">430</span> || StoreFileInfo.isReference(hfile.getName())<a name="line.430"></a>
+<span class="sourceLineNo">431</span> || HFileLink.isHFileLink(hfile.getName())) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> continue;<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> HFile.Reader reader = HFile.createReader(fs, hfile, conf);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> final byte[] first, last;<a name="line.435"></a>
+<span class="sourceLineNo">436</span> try {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> reader.loadFileInfo();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> first = reader.getFirstRowKey().get();<a name="line.438"></a>
+<span class="sourceLineNo">439</span> last = reader.getLastRowKey().get();<a name="line.439"></a>
+<span class="sourceLineNo">440</span> LOG.debug("Trying to figure out region boundaries hfile=" + hfile + " first="<a name="line.440"></a>
+<span class="sourceLineNo">441</span> + Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> // To eventually infer start key-end key boundaries<a name="line.443"></a>
+<span class="sourceLineNo">444</span> Integer value = map.containsKey(first) ? (Integer) map.get(first) : 0;<a name="line.444"></a>
+<span class="sourceLineNo">445</span> map.put(first, value + 1);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> value = map.containsKey(last) ? (Integer) map.get(last) : 0;<a name="line.446"></a>
+<span class="sourceLineNo">447</span> map.put(last, value - 1);<a name="line.447"></a>
+<span class="sourceLineNo">448</span> } finally {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> reader.close();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> return LoadIncrementalHFiles.inferBoundaries(map);<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> /**<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Prepare the table for bulkload, most codes copied from<a name="line.458"></a>
+<span class="sourceLineNo">459</span> * {@link LoadIncrementalHFiles#createTable(TableName, String, Admin)}<a name="line.459"></a>
+<span class="sourceLineNo">460</span> * @param conn connection<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * @param tableBackupPath path<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * @param tableName table name<a name="line.462"></a>
+<span class="sourceLineNo">463</span> * @param targetTableName target table name<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * @param regionDirList region directory list<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * @param htd table descriptor<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @param truncateIfExists truncates table if exists<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * @throws IOException exception<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> private void checkAndCreateTable(Connection conn, Path tableBackupPath, TableName tableName,<a name="line.469"></a>
+<span class="sourceLineNo">470</span> TableName targetTableName, ArrayList<Path> regionDirList, TableDescriptor htd,<a name="line.470"></a>
+<span class="sourceLineNo">471</span> boolean truncateIfExists) throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> try (Admin admin = conn.getAdmin()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> boolean createNew = false;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (admin.tableExists(targetTableName)) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (truncateIfExists) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> LOG.info("Truncating exising target table '" + targetTableName<a name="line.476"></a>
+<span class="sourceLineNo">477</span> + "', preserving region splits");<a name="line.477"></a>
+<span class="sourceLineNo">478</span> admin.disableTable(targetTableName);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> admin.truncateTable(targetTableName, true);<a name="line.479"></a>
+<span class="sourceLineNo">480</span> } else {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> LOG.info("Using exising target table '" + targetTableName + "'");<a name="line.481"></a>
+<span class="sourceLineNo">482</span> }<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } else {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> createNew = true;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span> if (createNew) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> LOG.info("Creating target table '" + targetTableName + "'");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> byte[][] keys;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (regionDirList == null || regionDirList.size() == 0) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> admin.createTable(htd, null);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> } else {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> keys = generateBoundaryKeys(regionDirList);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> // create table using table descriptor and region boundaries<a name="line.493"></a>
+<span class="sourceLineNo">494</span> admin.createTable(htd, keys);<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span><a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span> long startTime = EnvironmentEdgeManager.currentTime();<a name="line.498"></a>
+<span class="sourceLineNo">499</span> while (!admin.isTableAvailable(targetTableName)) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> try {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> Thread.sleep(100);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> } catch (InterruptedException ie) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> Thread.currentThread().interrupt();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if (EnvironmentEdgeManager.currentTime() - startTime > TABLE_AVAILABILITY_WAIT_TIME) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> throw new IOException("Time out " + TABLE_AVAILABILITY_WAIT_TIME + "ms expired, table "<a name="line.506"></a>
+<span class="sourceLineNo">507</span> + targetTableName + " is still not available");<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span> }<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span>}<a name="line.512"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.html
index 8842f7c..e04a607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.html
@@ -62,23 +62,24 @@
<span class="sourceLineNo">054</span> final FSDataOutputStream out;<a name="line.54"></a>
<span class="sourceLineNo">055</span> int bufferSize = fs.getConf().getInt(CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY,<a name="line.55"></a>
<span class="sourceLineNo">056</span> CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_DEFAULT);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> if (createParent) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> out = fs.create(f, overwrite, bufferSize, replication, blockSize, null);<a name="line.58"></a>
-<span class="sourceLineNo">059</span> } else {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> out = fs.createNonRecursive(f, overwrite, bufferSize, replication, blockSize, null);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span> // After we create the stream but before we attempt to use it at all<a name="line.62"></a>
-<span class="sourceLineNo">063</span> // ensure that we can provide the level of data safety we're configured<a name="line.63"></a>
-<span class="sourceLineNo">064</span> // to provide.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true) &&<a name="line.65"></a>
-<span class="sourceLineNo">066</span> !(CommonFSUtils.hasCapability(out, "hflush") &&<a name="line.66"></a>
-<span class="sourceLineNo">067</span> CommonFSUtils.hasCapability(out, "hsync"))) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> out.close();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> throw new CommonFSUtils.StreamLacksCapabilityException("hflush and hsync");<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span> return new WrapperAsyncFSOutput(f, out);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span>}<a name="line.73"></a>
+<span class="sourceLineNo">057</span> // This is not a Distributed File System, so it won't be erasure coded; no builder API needed<a name="line.57"></a>
+<span class="sourceLineNo">058</span> if (createParent) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> out = fs.create(f, overwrite, bufferSize, replication, blockSize, null);<a name="line.59"></a>
+<span class="sourceLineNo">060</span> } else {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> out = fs.createNonRecursive(f, overwrite, bufferSize, replication, blockSize, null);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span> // After we create the stream but before we attempt to use it at all<a name="line.63"></a>
+<span class="sourceLineNo">064</span> // ensure that we can provide the level of data safety we're configured<a name="line.64"></a>
+<span class="sourceLineNo">065</span> // to provide.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> if (fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true) &&<a name="line.66"></a>
+<span class="sourceLineNo">067</span> !(CommonFSUtils.hasCapability(out, "hflush") &&<a name="line.67"></a>
+<span class="sourceLineNo">068</span> CommonFSUtils.hasCapability(out, "hsync"))) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> out.close();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> throw new CommonFSUtils.StreamLacksCapabilityException("hflush and hsync");<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return new WrapperAsyncFSOutput(f, out);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span>}<a name="line.74"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.LeaseRecovery.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.LeaseRecovery.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.LeaseRecovery.html
index a07f45e..c63e65a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.LeaseRecovery.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.LeaseRecovery.html
@@ -1036,7 +1036,7 @@
<span class="sourceLineNo">1028</span> long startPos = -1;<a name="line.1028"></a>
<span class="sourceLineNo">1029</span> newLogFile = getLogFilePath(logId);<a name="line.1029"></a>
<span class="sourceLineNo">1030</span> try {<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span> newStream = fs.create(newLogFile, false);<a name="line.1031"></a>
+<span class="sourceLineNo">1031</span> newStream = CommonFSUtils.createForWal(fs, newLogFile, false);<a name="line.1031"></a>
<span class="sourceLineNo">1032</span> } catch (FileAlreadyExistsException e) {<a name="line.1032"></a>
<span class="sourceLineNo">1033</span> LOG.error("Log file with id=" + logId + " already exists", e);<a name="line.1033"></a>
<span class="sourceLineNo">1034</span> return false;<a name="line.1034"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html
index a07f45e..c63e65a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html
@@ -1036,7 +1036,7 @@
<span class="sourceLineNo">1028</span> long startPos = -1;<a name="line.1028"></a>
<span class="sourceLineNo">1029</span> newLogFile = getLogFilePath(logId);<a name="line.1029"></a>
<span class="sourceLineNo">1030</span> try {<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span> newStream = fs.create(newLogFile, false);<a name="line.1031"></a>
+<span class="sourceLineNo">1031</span> newStream = CommonFSUtils.createForWal(fs, newLogFile, false);<a name="line.1031"></a>
<span class="sourceLineNo">1032</span> } catch (FileAlreadyExistsException e) {<a name="line.1032"></a>
<span class="sourceLineNo">1033</span> LOG.error("Log file with id=" + logId + " already exists", e);<a name="line.1033"></a>
<span class="sourceLineNo">1034</span> return false;<a name="line.1034"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.SyncMetrics.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.SyncMetrics.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.SyncMetrics.html
index a07f45e..c63e65a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.SyncMetrics.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.SyncMetrics.html
@@ -1036,7 +1036,7 @@
<span class="sourceLineNo">1028</span> long startPos = -1;<a name="line.1028"></a>
<span class="sourceLineNo">1029</span> newLogFile = getLogFilePath(logId);<a name="line.1029"></a>
<span class="sourceLineNo">1030</span> try {<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span> newStream = fs.create(newLogFile, false);<a name="line.1031"></a>
+<span class="sourceLineNo">1031</span> newStream = CommonFSUtils.createForWal(fs, newLogFile, false);<a name="line.1031"></a>
<span class="sourceLineNo">1032</span> } catch (FileAlreadyExistsException e) {<a name="line.1032"></a>
<span class="sourceLineNo">1033</span> LOG.error("Log file with id=" + logId + " already exists", e);<a name="line.1033"></a>
<span class="sourceLineNo">1034</span> return false;<a name="line.1034"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html
index a07f45e..c63e65a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.html
@@ -1036,7 +1036,7 @@
<span class="sourceLineNo">1028</span> long startPos = -1;<a name="line.1028"></a>
<span class="sourceLineNo">1029</span> newLogFile = getLogFilePath(logId);<a name="line.1029"></a>
<span class="sourceLineNo">1030</span> try {<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span> newStream = fs.create(newLogFile, false);<a name="line.1031"></a>
+<span class="sourceLineNo">1031</span> newStream = CommonFSUtils.createForWal(fs, newLogFile, false);<a name="line.1031"></a>
<span class="sourceLineNo">1032</span> } catch (FileAlreadyExistsException e) {<a name="line.1032"></a>
<span class="sourceLineNo">1033</span> LOG.error("Log file with id=" + logId + " already exists", e);<a name="line.1033"></a>
<span class="sourceLineNo">1034</span> return false;<a name="line.1034"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e10887fe/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
index 2cafba9..677e77c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
@@ -68,68 +68,72 @@
<span class="sourceLineNo">060</span> public void close() throws IOException {<a name="line.60"></a>
<span class="sourceLineNo">061</span> if (this.output != null) {<a name="line.61"></a>
<span class="sourceLineNo">062</span> try {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> if (!trailerWritten) writeWALTrailer();<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.output.close();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> } catch (NullPointerException npe) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> // Can get a NPE coming up from down in DFSClient$DFSOutputStream#close<a name="line.66"></a>
-<span class="sourceLineNo">067</span> LOG.warn(npe.toString(), npe);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> }<a name="line.68"></a>
-<span class="sourceLineNo">069</span> this.output = null;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> @Override<a name="line.73"></a>
-<span class="sourceLineNo">074</span> public void sync(boolean forceSync) throws IOException {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> FSDataOutputStream fsdos = this.output;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> if (fsdos == null) return; // Presume closed<a name="line.76"></a>
-<span class="sourceLineNo">077</span> fsdos.flush();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> if (forceSync) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> fsdos.hsync();<a name="line.79"></a>
-<span class="sourceLineNo">080</span> } else {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> fsdos.hflush();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> public FSDataOutputStream getStream() {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return this.output;<a name="line.86"></a>
+<span class="sourceLineNo">063</span> if (!trailerWritten) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> writeWALTrailer();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.output.close();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> } catch (NullPointerException npe) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> // Can get a NPE coming up from down in DFSClient$DFSOutputStream#close<a name="line.68"></a>
+<span class="sourceLineNo">069</span> LOG.warn(npe.toString(), npe);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> }<a name="line.70"></a>
+<span class="sourceLineNo">071</span> this.output = null;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span> public void sync(boolean forceSync) throws IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> FSDataOutputStream fsdos = this.output;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> if (fsdos == null) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return; // Presume closed<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span> fsdos.flush();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> if (forceSync) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> fsdos.hsync();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> } else {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> fsdos.hflush();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> @SuppressWarnings("deprecation")<a name="line.89"></a>
-<span class="sourceLineNo">090</span> @Override<a name="line.90"></a>
-<span class="sourceLineNo">091</span> protected void initOutput(FileSystem fs, Path path, boolean overwritable, int bufferSize,<a name="line.91"></a>
-<span class="sourceLineNo">092</span> short replication, long blockSize) throws IOException, StreamLacksCapabilityException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> this.output = fs.createNonRecursive(path, overwritable, bufferSize, replication, blockSize,<a name="line.93"></a>
-<span class="sourceLineNo">094</span> null);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> if (fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true)) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (!CommonFSUtils.hasCapability(output, "hflush")) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> throw new StreamLacksCapabilityException("hflush");<a name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
-<span class="sourceLineNo">099</span> if (!CommonFSUtils.hasCapability(output, "hsync")) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> throw new StreamLacksCapabilityException("hsync");<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> @Override<a name="line.105"></a>
-<span class="sourceLineNo">106</span> protected long writeMagicAndWALHeader(byte[] magic, WALHeader header) throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> output.write(magic);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> header.writeDelimitedTo(output);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return output.getPos();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> @Override<a name="line.112"></a>
-<span class="sourceLineNo">113</span> protected OutputStream getOutputStreamForCellEncoder() {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return this.output;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
-<span class="sourceLineNo">118</span> protected long writeWALTrailerAndMagic(WALTrailer trailer, byte[] magic) throws IOException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> trailer.writeTo(output);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> output.writeInt(trailer.getSerializedSize());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> output.write(magic);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return output.getPos();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>}<a name="line.124"></a>
+<span class="sourceLineNo">089</span> public FSDataOutputStream getStream() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return this.output;<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> @SuppressWarnings("deprecation")<a name="line.93"></a>
+<span class="sourceLineNo">094</span> @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span> protected void initOutput(FileSystem fs, Path path, boolean overwritable, int bufferSize,<a name="line.95"></a>
+<span class="sourceLineNo">096</span> short replication, long blockSize) throws IOException, StreamLacksCapabilityException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> this.output = CommonFSUtils.createForWal(fs, path, overwritable, bufferSize, replication,<a name="line.97"></a>
+<span class="sourceLineNo">098</span> blockSize, false);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true)) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (!CommonFSUtils.hasCapability(output, "hflush")) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> throw new StreamLacksCapabilityException("hflush");<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (!CommonFSUtils.hasCapability(output, "hsync")) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> throw new StreamLacksCapabilityException("hsync");<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> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> @Override<a name="line.109"></a>
+<span class="sourceLineNo">110</span> protected long writeMagicAndWALHeader(byte[] magic, WALHeader header) throws IOException {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> output.write(magic);<a name="line.111"></a>
+<span class="sourceLineNo">112</span> header.writeDelimitedTo(output);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> return output.getPos();<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> @Override<a name="line.116"></a>
+<span class="sourceLineNo">117</span> protected OutputStream getOutputStreamForCellEncoder() {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> return this.output;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Override<a name="line.121"></a>
+<span class="sourceLineNo">122</span> protected long writeWALTrailerAndMagic(WALTrailer trailer, byte[] magic) throws IOException {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> trailer.writeTo(output);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> output.writeInt(trailer.getSerializedSize());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> output.write(magic);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return output.getPos();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span>}<a name="line.128"></a>