hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [24/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Sat, 13 May 2017 14:59:06 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e0a5167/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.html
index 2ccefa4..87d7143 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.html
@@ -141,1653 +141,1703 @@
 <span class="sourceLineNo">133</span><a name="line.133"></a>
 <span class="sourceLineNo">134</span>  private final static String BACKUP_INFO_PREFIX = "session:";<a name="line.134"></a>
 <span class="sourceLineNo">135</span>  private final static String START_CODE_ROW = "startcode:";<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private final static String INCR_BACKUP_SET = "incrbackupset:";<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  private final static String TABLE_RS_LOG_MAP_PREFIX = "trslm:";<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  private final static String RS_LOG_TS_PREFIX = "rslogts:";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  private final static String BULK_LOAD_PREFIX = "bulk:";<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private final static byte[] BULK_LOAD_PREFIX_BYTES = BULK_LOAD_PREFIX.getBytes();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  final static byte[] TBL_COL = Bytes.toBytes("tbl");<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  final static byte[] FAM_COL = Bytes.toBytes("fam");<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  final static byte[] PATH_COL = Bytes.toBytes("path");<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  final static byte[] STATE_COL = Bytes.toBytes("state");<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  // the two states a bulk loaded file can be<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  final static byte[] BL_PREPARE = Bytes.toBytes("R");<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  final static byte[] BL_COMMIT = Bytes.toBytes("D");<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>  private final static String WALS_PREFIX = "wals:";<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  private final static String SET_KEY_PREFIX = "backupset:";<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  // separator between BULK_LOAD_PREFIX and ordinals<a name="line.153"></a>
-<span class="sourceLineNo">154</span> protected final static String BLK_LD_DELIM = ":";<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private final static byte[] EMPTY_VALUE = new byte[] {};<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  // Safe delimiter in a string<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  private final static String NULL = "\u0000";<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public BackupSystemTable(Connection conn) throws IOException {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    this.connection = conn;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    tableName = BackupSystemTable.getTableName(conn.getConfiguration());<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    checkSystemTable();<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
+<span class="sourceLineNo">136</span>  private final static byte[] ACTIVE_SESSION_ROW = "activesession:".getBytes();<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private final static byte[] ACTIVE_SESSION_COL = "c".getBytes();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  private final static byte[] ACTIVE_SESSION_YES = "yes".getBytes();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private final static byte[] ACTIVE_SESSION_NO = "no".getBytes();<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>  private final static String INCR_BACKUP_SET = "incrbackupset:";<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private final static String TABLE_RS_LOG_MAP_PREFIX = "trslm:";<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  private final static String RS_LOG_TS_PREFIX = "rslogts:";<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private final static String BULK_LOAD_PREFIX = "bulk:";<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  private final static byte[] BULK_LOAD_PREFIX_BYTES = BULK_LOAD_PREFIX.getBytes();<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  final static byte[] TBL_COL = Bytes.toBytes("tbl");<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  final static byte[] FAM_COL = Bytes.toBytes("fam");<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  final static byte[] PATH_COL = Bytes.toBytes("path");<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  final static byte[] STATE_COL = Bytes.toBytes("state");<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  // the two states a bulk loaded file can be<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  final static byte[] BL_PREPARE = Bytes.toBytes("R");<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  final static byte[] BL_COMMIT = Bytes.toBytes("D");<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  private final static String WALS_PREFIX = "wals:";<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  private final static String SET_KEY_PREFIX = "backupset:";<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>  // separator between BULK_LOAD_PREFIX and ordinals<a name="line.159"></a>
+<span class="sourceLineNo">160</span> protected final static String BLK_LD_DELIM = ":";<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  private final static byte[] EMPTY_VALUE = new byte[] {};<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  // Safe delimiter in a string<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  private final static String NULL = "\u0000";<a name="line.164"></a>
 <span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>  private void checkSystemTable() throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    try (Admin admin = connection.getAdmin();) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>      verifyNamespaceExists(admin);<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>      if (!admin.tableExists(tableName)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        HTableDescriptor backupHTD =<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            BackupSystemTable.getSystemTableDescriptor(connection.getConfiguration());<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        admin.createTable(backupHTD);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      waitForSystemTable(admin);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private void verifyNamespaceExists(Admin admin) throws IOException {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      String namespaceName  = tableName.getNamespaceAsString();<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      NamespaceDescriptor ns = NamespaceDescriptor.create(namespaceName).build();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      NamespaceDescriptor[] list = admin.listNamespaceDescriptors();<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      boolean exists = false;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      for( NamespaceDescriptor nsd: list) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        if (nsd.getName().equals(ns.getName())) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>          exists = true;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          break;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      if (!exists) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        admin.createNamespace(ns);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>  }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>  private void waitForSystemTable(Admin admin) throws IOException {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    long TIMEOUT = 60000;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    long startTime = EnvironmentEdgeManager.currentTime();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    while (!admin.tableExists(tableName) || !admin.isTableAvailable(tableName)) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      try {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        Thread.sleep(100);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      } catch (InterruptedException e) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      if (EnvironmentEdgeManager.currentTime() - startTime &gt; TIMEOUT) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        throw new IOException("Failed to create backup system table after "+ TIMEOUT+"ms");<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    LOG.debug("Backup table exists and available");<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  @Override<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  public void close() {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    // do nothing<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">166</span>  public BackupSystemTable(Connection conn) throws IOException {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    this.connection = conn;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    tableName = BackupSystemTable.getTableName(conn.getConfiguration());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    checkSystemTable();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  private void checkSystemTable() throws IOException {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    try (Admin admin = connection.getAdmin();) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>      verifyNamespaceExists(admin);<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if (!admin.tableExists(tableName)) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        HTableDescriptor backupHTD =<a name="line.178"></a>
+<span class="sourceLineNo">179</span>            BackupSystemTable.getSystemTableDescriptor(connection.getConfiguration());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        admin.createTable(backupHTD);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      waitForSystemTable(admin);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  private void verifyNamespaceExists(Admin admin) throws IOException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      String namespaceName  = tableName.getNamespaceAsString();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      NamespaceDescriptor ns = NamespaceDescriptor.create(namespaceName).build();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      NamespaceDescriptor[] list = admin.listNamespaceDescriptors();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      boolean exists = false;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      for( NamespaceDescriptor nsd: list) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        if (nsd.getName().equals(ns.getName())) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          exists = true;<a name="line.193"></a>
+<span class="sourceLineNo">194</span>          break;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      if (!exists) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        admin.createNamespace(ns);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>  private void waitForSystemTable(Admin admin) throws IOException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    long TIMEOUT = 60000;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    long startTime = EnvironmentEdgeManager.currentTime();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    while (!admin.tableExists(tableName) || !admin.isTableAvailable(tableName)) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      try {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        Thread.sleep(100);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      } catch (InterruptedException e) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      if (EnvironmentEdgeManager.currentTime() - startTime &gt; TIMEOUT) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        throw new IOException("Failed to create backup system table after "+ TIMEOUT+"ms");<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    }<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    LOG.debug("Backup table exists and available");<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
 <span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>  /**<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * Updates status (state) of a backup session in backup system table table<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * @param info backup info<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * @throws IOException exception<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   */<a name="line.223"></a>
-<span class="sourceLineNo">224</span>  public void updateBackupInfo(BackupInfo info) throws IOException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>    if (LOG.isTraceEnabled()) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      LOG.trace("update backup status in backup system table for: " + info.getBackupId()<a name="line.227"></a>
-<span class="sourceLineNo">228</span>          + " set status=" + info.getState());<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    try (Table table = connection.getTable(tableName)) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      Put put = createPutForBackupInfo(info);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      table.put(put);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>  /*<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @param backupId the backup Id<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   * @return Map of rows to path of bulk loaded hfile<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  Map&lt;byte[], String&gt; readBulkLoadedFiles(String backupId) throws IOException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    Scan scan = BackupSystemTable.createScanForBulkLoadedFiles(backupId);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    try (Table table = connection.getTable(tableName);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        ResultScanner scanner = table.getScanner(scan)) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      Result res = null;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      Map&lt;byte[], String&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      while ((res = scanner.next()) != null) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        res.advance();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        byte[] row = CellUtil.cloneRow(res.listCells().get(0));<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        for (Cell cell : res.listCells()) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span>              BackupSystemTable.PATH_COL.length) == 0) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>            map.put(row, Bytes.toString(CellUtil.cloneValue(cell)));<a name="line.252"></a>
-<span class="sourceLineNo">253</span>          }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return map;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>  /*<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   * Used during restore<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * @param backupId the backup Id<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @param sTableList List of tables<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @return array of Map of family to List of Paths<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  public Map&lt;byte[], List&lt;Path&gt;&gt;[] readBulkLoadedFiles(String backupId, List&lt;TableName&gt; sTableList)<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      throws IOException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Scan scan = BackupSystemTable.createScanForBulkLoadedFiles(backupId);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    Map&lt;byte[], List&lt;Path&gt;&gt;[] mapForSrc = new Map[sTableList == null ? 1 : sTableList.size()];<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    try (Table table = connection.getTable(tableName);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        ResultScanner scanner = table.getScanner(scan)) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      Result res = null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      while ((res = scanner.next()) != null) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        res.advance();<a name="line.274"></a>
-<span class="sourceLineNo">275</span>        TableName tbl = null;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>        byte[] fam = null;<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        String path = null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        for (Cell cell : res.listCells()) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>          if (CellComparator.compareQualifiers(cell, BackupSystemTable.TBL_COL, 0,<a name="line.279"></a>
-<span class="sourceLineNo">280</span>              BackupSystemTable.TBL_COL.length) == 0) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            tbl = TableName.valueOf(CellUtil.cloneValue(cell));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>          } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.FAM_COL, 0,<a name="line.282"></a>
-<span class="sourceLineNo">283</span>              BackupSystemTable.FAM_COL.length) == 0) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            fam = CellUtil.cloneValue(cell);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>          } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.285"></a>
-<span class="sourceLineNo">286</span>              BackupSystemTable.PATH_COL.length) == 0) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>            path = Bytes.toString(CellUtil.cloneValue(cell));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        int srcIdx = IncrementalTableBackupClient.getIndex(tbl, sTableList);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        if (srcIdx == -1) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>          // the table is not among the query<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          continue;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>        if (mapForSrc[srcIdx] == null) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>          mapForSrc[srcIdx] = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        List&lt;Path&gt; files;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        if (!mapForSrc[srcIdx].containsKey(fam)) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>          files = new ArrayList&lt;Path&gt;();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          mapForSrc[srcIdx].put(fam, files);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          files = mapForSrc[srcIdx].get(fam);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        files.add(new Path(path));<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        if (LOG.isDebugEnabled()) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>          LOG.debug("found bulk loaded file : " + tbl + " " +  Bytes.toString(fam) + " " + path);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      };<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      return mapForSrc;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>  /*<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   * @param map Map of row keys to path of bulk loaded hfile<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>  void deleteBulkLoadedFiles(Map&lt;byte[], String&gt; map) throws IOException {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    try (Table table = connection.getTable(tableName)) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      List&lt;Delete&gt; dels = new ArrayList&lt;&gt;();<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      for (byte[] row : map.keySet()) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        dels.add(new Delete(row).addFamily(BackupSystemTable.META_FAMILY));<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      table.delete(dels);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * Deletes backup status from backup system table table<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param backupId backup id<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @throws IOException exception<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   */<a name="line.331"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public void close() {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    // do nothing<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * Updates status (state) of a backup session in backup system table table<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * @param info backup info<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * @throws IOException exception<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   */<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public void updateBackupInfo(BackupInfo info) throws IOException {<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>    if (LOG.isTraceEnabled()) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      LOG.trace("update backup status in backup system table for: " + info.getBackupId()<a name="line.233"></a>
+<span class="sourceLineNo">234</span>          + " set status=" + info.getState());<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    try (Table table = connection.getTable(tableName)) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      Put put = createPutForBackupInfo(info);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      table.put(put);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  /*<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * @param backupId the backup Id<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * @return Map of rows to path of bulk loaded hfile<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  Map&lt;byte[], String&gt; readBulkLoadedFiles(String backupId) throws IOException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    Scan scan = BackupSystemTable.createScanForBulkLoadedFiles(backupId);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    try (Table table = connection.getTable(tableName);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        ResultScanner scanner = table.getScanner(scan)) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      Result res = null;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      Map&lt;byte[], String&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      while ((res = scanner.next()) != null) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        res.advance();<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        byte[] row = CellUtil.cloneRow(res.listCells().get(0));<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        for (Cell cell : res.listCells()) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.256"></a>
+<span class="sourceLineNo">257</span>              BackupSystemTable.PATH_COL.length) == 0) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>            map.put(row, Bytes.toString(CellUtil.cloneValue(cell)));<a name="line.258"></a>
+<span class="sourceLineNo">259</span>          }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      }<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      return map;<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><a name="line.265"></a>
+<span class="sourceLineNo">266</span>  /*<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * Used during restore<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * @param backupId the backup Id<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * @param sTableList List of tables<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   * @return array of Map of family to List of Paths<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   */<a name="line.271"></a>
+<span class="sourceLineNo">272</span>  public Map&lt;byte[], List&lt;Path&gt;&gt;[] readBulkLoadedFiles(String backupId, List&lt;TableName&gt; sTableList)<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    Scan scan = BackupSystemTable.createScanForBulkLoadedFiles(backupId);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    Map&lt;byte[], List&lt;Path&gt;&gt;[] mapForSrc = new Map[sTableList == null ? 1 : sTableList.size()];<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    try (Table table = connection.getTable(tableName);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        ResultScanner scanner = table.getScanner(scan)) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      Result res = null;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      while ((res = scanner.next()) != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        res.advance();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        TableName tbl = null;<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        byte[] fam = null;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        String path = null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        for (Cell cell : res.listCells()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>          if (CellComparator.compareQualifiers(cell, BackupSystemTable.TBL_COL, 0,<a name="line.285"></a>
+<span class="sourceLineNo">286</span>              BackupSystemTable.TBL_COL.length) == 0) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            tbl = TableName.valueOf(CellUtil.cloneValue(cell));<a name="line.287"></a>
+<span class="sourceLineNo">288</span>          } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.FAM_COL, 0,<a name="line.288"></a>
+<span class="sourceLineNo">289</span>              BackupSystemTable.FAM_COL.length) == 0) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>            fam = CellUtil.cloneValue(cell);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>          } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.291"></a>
+<span class="sourceLineNo">292</span>              BackupSystemTable.PATH_COL.length) == 0) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>            path = Bytes.toString(CellUtil.cloneValue(cell));<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>        int srcIdx = IncrementalTableBackupClient.getIndex(tbl, sTableList);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        if (srcIdx == -1) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          // the table is not among the query<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          continue;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        if (mapForSrc[srcIdx] == null) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          mapForSrc[srcIdx] = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        List&lt;Path&gt; files;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        if (!mapForSrc[srcIdx].containsKey(fam)) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          files = new ArrayList&lt;Path&gt;();<a name="line.306"></a>
+<span class="sourceLineNo">307</span>          mapForSrc[srcIdx].put(fam, files);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        } else {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>          files = mapForSrc[srcIdx].get(fam);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        files.add(new Path(path));<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        if (LOG.isDebugEnabled()) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>          LOG.debug("found bulk loaded file : " + tbl + " " +  Bytes.toString(fam) + " " + path);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      };<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      return mapForSrc;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>  /*<a name="line.320"></a>
+<span class="sourceLineNo">321</span>   * @param map Map of row keys to path of bulk loaded hfile<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   */<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  void deleteBulkLoadedFiles(Map&lt;byte[], String&gt; map) throws IOException {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    try (Table table = connection.getTable(tableName)) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;Delete&gt; dels = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (byte[] row : map.keySet()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        dels.add(new Delete(row).addFamily(BackupSystemTable.META_FAMILY));<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      table.delete(dels);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
 <span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public void deleteBackupInfo(String backupId) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (LOG.isTraceEnabled()) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      LOG.trace("delete backup status in backup system table for " + backupId);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    try (Table table = connection.getTable(tableName)) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      Delete del = createDeleteForBackupInfo(backupId);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      table.delete(del);<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><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  /*<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * For postBulkLoadHFile() hook.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   * @param tabName table name<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   * @param region the region receiving hfile<a name="line.347"></a>
-<span class="sourceLineNo">348</span>   * @param finalPaths family and associated hfiles<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   */<a name="line.349"></a>
-<span class="sourceLineNo">350</span>  public void writePathsPostBulkLoad(TableName tabName, byte[] region,<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      Map&lt;byte[], List&lt;Path&gt;&gt; finalPaths) throws IOException {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    if (LOG.isDebugEnabled()) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      LOG.debug("write bulk load descriptor to backup " + tabName + " with " +<a name="line.353"></a>
-<span class="sourceLineNo">354</span>          finalPaths.size() + " entries");<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    try (Table table = connection.getTable(tableName)) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      List&lt;Put&gt; puts = BackupSystemTable.createPutForCommittedBulkload(tabName, region,<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          finalPaths);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      table.put(puts);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      LOG.debug("written " + puts.size() + " rows for bulk load of " + tabName);<a name="line.360"></a>
+<span class="sourceLineNo">333</span>  /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * Deletes backup status from backup system table table<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * @param backupId backup id<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   * @throws IOException exception<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   */<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span>  public void deleteBackupInfo(String backupId) throws IOException {<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (LOG.isTraceEnabled()) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      LOG.trace("delete backup status in backup system table for " + backupId);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    try (Table table = connection.getTable(tableName)) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      Delete del = createDeleteForBackupInfo(backupId);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      table.delete(del);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>  /*<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   * For postBulkLoadHFile() hook.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   * @param tabName table name<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   * @param region the region receiving hfile<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   * @param finalPaths family and associated hfiles<a name="line.354"></a>
+<span class="sourceLineNo">355</span>   */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  public void writePathsPostBulkLoad(TableName tabName, byte[] region,<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      Map&lt;byte[], List&lt;Path&gt;&gt; finalPaths) throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (LOG.isDebugEnabled()) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      LOG.debug("write bulk load descriptor to backup " + tabName + " with " +<a name="line.359"></a>
+<span class="sourceLineNo">360</span>          finalPaths.size() + " entries");<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>   * For preCommitStoreFile() hook<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @param tabName table name<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * @param region the region receiving hfile<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   * @param family column family<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   * @param pairs list of paths for hfiles<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   */<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  public void writeFilesForBulkLoadPreCommit(TableName tabName, byte[] region,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      final byte[] family, final List&lt;Pair&lt;Path, Path&gt;&gt; pairs) throws IOException {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    if (LOG.isDebugEnabled()) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      LOG.debug("write bulk load descriptor to backup " + tabName + " with " +<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          pairs.size() + " entries");<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    try (Table table = connection.getTable(tableName)) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      List&lt;Put&gt; puts = BackupSystemTable.createPutForPreparedBulkload(tabName, region,<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          family, pairs);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      table.put(puts);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      LOG.debug("written " + puts.size() + " rows for bulk load of " + tabName);<a name="line.380"></a>
+<span class="sourceLineNo">362</span>    try (Table table = connection.getTable(tableName)) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      List&lt;Put&gt; puts = BackupSystemTable.createPutForCommittedBulkload(tabName, region,<a name="line.363"></a>
+<span class="sourceLineNo">364</span>          finalPaths);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>      table.put(puts);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      LOG.debug("written " + puts.size() + " rows for bulk load of " + tabName);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  /*<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   * For preCommitStoreFile() hook<a name="line.370"></a>
+<span class="sourceLineNo">371</span>   * @param tabName table name<a name="line.371"></a>
+<span class="sourceLineNo">372</span>   * @param region the region receiving hfile<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * @param family column family<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * @param pairs list of paths for hfiles<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   */<a name="line.375"></a>
+<span class="sourceLineNo">376</span>  public void writeFilesForBulkLoadPreCommit(TableName tabName, byte[] region,<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      final byte[] family, final List&lt;Pair&lt;Path, Path&gt;&gt; pairs) throws IOException {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    if (LOG.isDebugEnabled()) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      LOG.debug("write bulk load descriptor to backup " + tabName + " with " +<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          pairs.size() + " entries");<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><a name="line.383"></a>
-<span class="sourceLineNo">384</span>  /*<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Removes rows recording bulk loaded hfiles from backup table<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param lst list of table names<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @param rows the rows to be deleted<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   */<a name="line.388"></a>
-<span class="sourceLineNo">389</span>  public void removeBulkLoadedRows(List&lt;TableName&gt; lst, List&lt;byte[]&gt; rows) throws IOException {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    try (Table table = connection.getTable(tableName)) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      List&lt;Delete&gt; lstDels = new ArrayList&lt;&gt;();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      for (byte[] row : rows) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        Delete del = new Delete(row);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        lstDels.add(del);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        LOG.debug("orig deleting the row: " + Bytes.toString(row));<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      table.delete(lstDels);<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      LOG.debug("deleted " + rows.size() + " original bulkload rows for " + lst.size() + " tables");<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><a name="line.401"></a>
-<span class="sourceLineNo">402</span>  /*<a name="line.402"></a>
-<span class="sourceLineNo">403</span>   * Reads the rows from backup table recording bulk loaded hfiles<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   * @param tableList list of table names<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   * @return The keys of the Map are table, region and column family.<a name="line.405"></a>
-<span class="sourceLineNo">406</span>   *  Value of the map reflects whether the hfile was recorded by preCommitStoreFile hook (true)<a name="line.406"></a>
-<span class="sourceLineNo">407</span>   */<a name="line.407"></a>
-<span class="sourceLineNo">408</span>  public Pair&lt;Map&lt;TableName, Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;&gt;, List&lt;byte[]&gt;&gt;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>  readBulkloadRows(List&lt;TableName&gt; tableList) throws IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    Map&lt;TableName, Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;&gt; map = new HashMap&lt;&gt;();<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    List&lt;byte[]&gt; rows = new ArrayList&lt;&gt;();<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    for (TableName tTable : tableList) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      Scan scan = BackupSystemTable.createScanForOrigBulkLoadedFiles(tTable);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt; tblMap = map.get(tTable);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      try (Table table = connection.getTable(tableName);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>          ResultScanner scanner = table.getScanner(scan)) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        Result res = null;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        while ((res = scanner.next()) != null) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          res.advance();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>          String fam = null;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>          String path = null;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>          boolean raw = false;<a name="line.422"></a>
-<span class="sourceLineNo">423</span>          byte[] row = null;<a name="line.423"></a>
-<span class="sourceLineNo">424</span>          String region = null;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>          for (Cell cell : res.listCells()) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>            row = CellUtil.cloneRow(cell);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>            rows.add(row);<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            String rowStr = Bytes.toString(row);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>            region = BackupSystemTable.getRegionNameFromOrigBulkLoadRow(rowStr);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            if (CellComparator.compareQualifiers(cell, BackupSystemTable.FAM_COL, 0,<a name="line.430"></a>
-<span class="sourceLineNo">431</span>                BackupSystemTable.FAM_COL.length) == 0) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>              fam = Bytes.toString(CellUtil.cloneValue(cell));<a name="line.432"></a>
-<span class="sourceLineNo">433</span>            } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.433"></a>
-<span class="sourceLineNo">434</span>                BackupSystemTable.PATH_COL.length) == 0) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>              path = Bytes.toString(CellUtil.cloneValue(cell));<a name="line.435"></a>
-<span class="sourceLineNo">436</span>            } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.STATE_COL, 0,<a name="line.436"></a>
-<span class="sourceLineNo">437</span>                BackupSystemTable.STATE_COL.length) == 0) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>              byte[] state = CellUtil.cloneValue(cell);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>              if (Bytes.equals(BackupSystemTable.BL_PREPARE, state)) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>                raw = true;<a name="line.440"></a>
-<span class="sourceLineNo">441</span>              } else raw = false;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>            }<a name="line.442"></a>
-<span class="sourceLineNo">443</span>          }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>          if (map.get(tTable) == null) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            map.put(tTable, new HashMap&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;());<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            tblMap = map.get(tTable);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>          }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>          if (tblMap.get(region) == null) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            tblMap.put(region, new HashMap&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;());<a name="line.449"></a>
-<span class="sourceLineNo">450</span>          }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>          Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt; famMap = tblMap.get(region);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>          if (famMap.get(fam) == null) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            famMap.put(fam, new ArrayList&lt;Pair&lt;String, Boolean&gt;&gt;());<a name="line.453"></a>
-<span class="sourceLineNo">454</span>          }<a name="line.454"></a>
-<span class="sourceLineNo">455</span>          famMap.get(fam).add(new Pair&lt;&gt;(path, raw));<a name="line.455"></a>
-<span class="sourceLineNo">456</span>          LOG.debug("found orig " + path + " for " + fam + " of table " + region);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        }<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      }<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    }<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    return new Pair&lt;&gt;(map, rows);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>  }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>  /*<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @param sTableList List of tables<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @param maps array of Map of family to List of Paths<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * @param backupId the backup Id<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  public void writeBulkLoadedFiles(List&lt;TableName&gt; sTableList, Map&lt;byte[], List&lt;Path&gt;&gt;[] maps,<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      String backupId) throws IOException {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    try (Table table = connection.getTable(tableName)) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      long ts = EnvironmentEdgeManager.currentTime();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      int cnt = 0;<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      List&lt;Put&gt; puts = new ArrayList&lt;&gt;();<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      for (int idx = 0; idx &lt; maps.length; idx++) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>        Map&lt;byte[], List&lt;Path&gt;&gt; map = maps[idx];<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        TableName tn = sTableList.get(idx);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>        if (map == null) continue;<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        for (Map.Entry&lt;byte[], List&lt;Path&gt;&gt; entry: map.entrySet()) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>          byte[] fam = entry.getKey();<a name="line.479"></a>
-<span class="sourceLineNo">480</span>          List&lt;Path&gt; paths = entry.getValue();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          for (Path p : paths) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>            Put put = BackupSystemTable.createPutForBulkLoadedFile(tn, fam, p.toString(),<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                backupId, ts, cnt++);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>            puts.add(put);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>          }<a name="line.485"></a>
-<span class="sourceLineNo">486</span>        }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      if (!puts.isEmpty()) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        table.put(puts);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      }<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    }<a name="line.491"></a>
-<span class="sourceLineNo">492</span>  }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span>  /**<a name="line.494"></a>
-<span class="sourceLineNo">495</span>   * Reads backup status object (instance of backup info) from backup system table table<a name="line.495"></a>
-<span class="sourceLineNo">496</span>   * @param backupId backup id<a name="line.496"></a>
-<span class="sourceLineNo">497</span>   * @return Current status of backup session or null<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   */<a name="line.498"></a>
+<span class="sourceLineNo">382</span>    try (Table table = connection.getTable(tableName)) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      List&lt;Put&gt; puts = BackupSystemTable.createPutForPreparedBulkload(tabName, region,<a name="line.383"></a>
+<span class="sourceLineNo">384</span>          family, pairs);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      table.put(puts);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      LOG.debug("written " + puts.size() + " rows for bulk load of " + tabName);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
+<span class="sourceLineNo">388</span>  }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>  /*<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * Removes rows recording bulk loaded hfiles from backup table<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   * @param lst list of table names<a name="line.392"></a>
+<span class="sourceLineNo">393</span>   * @param rows the rows to be deleted<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  public void removeBulkLoadedRows(List&lt;TableName&gt; lst, List&lt;byte[]&gt; rows) throws IOException {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    try (Table table = connection.getTable(tableName)) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      List&lt;Delete&gt; lstDels = new ArrayList&lt;&gt;();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      for (byte[] row : rows) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        Delete del = new Delete(row);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        lstDels.add(del);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        LOG.debug("orig deleting the row: " + Bytes.toString(row));<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      table.delete(lstDels);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      LOG.debug("deleted " + rows.size() + " original bulkload rows for " + lst.size() + " tables");<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>  }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>  /*<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   * Reads the rows from backup table recording bulk loaded hfiles<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   * @param tableList list of table names<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * @return The keys of the Map are table, region and column family.<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   *  Value of the map reflects whether the hfile was recorded by preCommitStoreFile hook (true)<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   */<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public Pair&lt;Map&lt;TableName, Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;&gt;, List&lt;byte[]&gt;&gt;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>  readBulkloadRows(List&lt;TableName&gt; tableList) throws IOException {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    Map&lt;TableName, Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;&gt; map = new HashMap&lt;&gt;();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    List&lt;byte[]&gt; rows = new ArrayList&lt;&gt;();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    for (TableName tTable : tableList) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      Scan scan = BackupSystemTable.createScanForOrigBulkLoadedFiles(tTable);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt; tblMap = map.get(tTable);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      try (Table table = connection.getTable(tableName);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>          ResultScanner scanner = table.getScanner(scan)) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        Result res = null;<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        while ((res = scanner.next()) != null) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>          res.advance();<a name="line.425"></a>
+<span class="sourceLineNo">426</span>          String fam = null;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>          String path = null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span>          boolean raw = false;<a name="line.428"></a>
+<span class="sourceLineNo">429</span>          byte[] row = null;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>          String region = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>          for (Cell cell : res.listCells()) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            row = CellUtil.cloneRow(cell);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>            rows.add(row);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            String rowStr = Bytes.toString(row);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            region = BackupSystemTable.getRegionNameFromOrigBulkLoadRow(rowStr);<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            if (CellComparator.compareQualifiers(cell, BackupSystemTable.FAM_COL, 0,<a name="line.436"></a>
+<span class="sourceLineNo">437</span>                BackupSystemTable.FAM_COL.length) == 0) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>              fam = Bytes.toString(CellUtil.cloneValue(cell));<a name="line.438"></a>
+<span class="sourceLineNo">439</span>            } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.PATH_COL, 0,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>                BackupSystemTable.PATH_COL.length) == 0) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>              path = Bytes.toString(CellUtil.cloneValue(cell));<a name="line.441"></a>
+<span class="sourceLineNo">442</span>            } else if (CellComparator.compareQualifiers(cell, BackupSystemTable.STATE_COL, 0,<a name="line.442"></a>
+<span class="sourceLineNo">443</span>                BackupSystemTable.STATE_COL.length) == 0) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>              byte[] state = CellUtil.cloneValue(cell);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>              if (Bytes.equals(BackupSystemTable.BL_PREPARE, state)) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>                raw = true;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              } else raw = false;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>            }<a name="line.448"></a>
+<span class="sourceLineNo">449</span>          }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>          if (map.get(tTable) == null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            map.put(tTable, new HashMap&lt;String, Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;&gt;());<a name="line.451"></a>
+<span class="sourceLineNo">452</span>            tblMap = map.get(tTable);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>          }<a name="line.453"></a>
+<span class="sourceLineNo">454</span>          if (tblMap.get(region) == null) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>            tblMap.put(region, new HashMap&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt;());<a name="line.455"></a>
+<span class="sourceLineNo">456</span>          }<a name="line.456"></a>
+<span class="sourceLineNo">457</span>          Map&lt;String, List&lt;Pair&lt;String, Boolean&gt;&gt;&gt; famMap = tblMap.get(region);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>          if (famMap.get(fam) == null) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            famMap.put(fam, new ArrayList&lt;Pair&lt;String, Boolean&gt;&gt;());<a name="line.459"></a>
+<span class="sourceLineNo">460</span>          }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>          famMap.get(fam).add(new Pair&lt;&gt;(path, raw));<a name="line.461"></a>
+<span class="sourceLineNo">462</span>          LOG.debug("found orig " + path + " for " + fam + " of table " + region);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    return new Pair&lt;&gt;(map, rows);<a name="line.466"></a>
+<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span>  /*<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   * @param sTableList List of tables<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * @param maps array of Map of family to List of Paths<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * @param backupId the backup Id<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   */<a name="line.473"></a>
+<span class="sourceLineNo">474</span>  public void writeBulkLoadedFiles(List&lt;TableName&gt; sTableList, Map&lt;byte[], List&lt;Path&gt;&gt;[] maps,<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      String backupId) throws IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    try (Table table = connection.getTable(tableName)) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      long ts = EnvironmentEdgeManager.currentTime();<a name="line.477"></a>
+<span class="sourceLineNo">478</span>      int cnt = 0;<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      List&lt;Put&gt; puts = new ArrayList&lt;&gt;();<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      for (int idx = 0; idx &lt; maps.length; idx++) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>        Map&lt;byte[], List&lt;Path&gt;&gt; map = maps[idx];<a name="line.481"></a>
+<span class="sourceLineNo">482</span>        TableName tn = sTableList.get(idx);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>        if (map == null) continue;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        for (Map.Entry&lt;byte[], List&lt;Path&gt;&gt; entry: map.entrySet()) {<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          byte[] fam = entry.getKey();<a name="line.485"></a>
+<span class="sourceLineNo">486</span>          List&lt;Path&gt; paths = entry.getValue();<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          for (Path p : paths) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>            Put put = BackupSystemTable.createPutForBulkLoadedFile(tn, fam, p.toString(),<a name="line.488"></a>
+<span class="sourceLineNo">489</span>                backupId, ts, cnt++);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>            puts.add(put);<a name="line.490"></a>
+<span class="sourceLineNo">491</span>          }<a name="line.491"></a>
+<span class="sourceLineNo">492</span>        }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>      }<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (!puts.isEmpty()) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        table.put(puts);<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>  }<a name="line.498"></a>
 <span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>  public BackupInfo readBackupInfo(String backupId) throws IOException {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    if (LOG.isTraceEnabled()) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      LOG.trace("read backup status from backup system table for: " + backupId);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>    try (Table table = connection.getTable(tableName)) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      Get get = createGetForBackupInfo(backupId);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      Result res = table.get(get);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      if (res.isEmpty()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span>        return null;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      }<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      return resultToBackupInfo(res);<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>  }<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span>  /**<a name="line.515"></a>
-<span class="sourceLineNo">516</span>   * Read the last backup start code (timestamp) of last successful backup. Will return null if<a name="line.516"></a>
-<span class="sourceLineNo">517</span>   * there is no start code stored on hbase or the value is of length 0. These two cases indicate<a name="line.517"></a>
-<span class="sourceLineNo">518</span>   * there is no successful backup completed so far.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>   * @param backupRoot directory path to backup destination<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   * @return the timestamp of last successful backup<a name="line.520"></a>
-<span class="sourceLineNo">521</span>   * @throws IOException exception<a name="line.521"></a>
-<span class="sourceLineNo">522</span>   */<a name="line.522"></a>
-<span class="sourceLineNo">523</span>  public String readBackupStartCode(String backupRoot) throws IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    if (LOG.isTraceEnabled()) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      LOG.trace("read backup start code from backup system table");<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    }<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    try (Table table = connection.getTable(tableName)) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      Get get = createGetForStartCode(backupRoot);<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      Result res = table.get(get);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      if (res.isEmpty()) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        return null;<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      }<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      Cell cell = res.listCells().get(0);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      byte[] val = CellUtil.cloneValue(cell);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      if (val.length == 0) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>        return null;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      return new String(val);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    }<a name="line.539"></a>
-<span class="sourceLineNo">540</span>  }<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>  /**<a name="line.542"></a>
-<span class="sourceLineNo">543</span>   * Write the start code (timestamp) to backup system table. If passed in null, then write 0 byte.<a name="line.543"></a>
-<span class="sourceLineNo">544</span>   * @param startCode start code<a name="line.544"></a>
-<span class="sourceLineNo">545</span>   * @param backupRoot root directory path to backup<a name="line.545"></a>
-<span class="sourceLineNo">546</span>   * @throws IOException exception<a name="line.546"></a>
-<span class="sourceLineNo">547</span>   */<a name="line.547"></a>
-<span class="sourceLineNo">548</span>  public void writeBackupStartCode(Long startCode, String backupRoot) throws IOException {<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    if (LOG.isTraceEnabled()) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.trace("write backup start code to backup system table " + startCode);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    }<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    try (Table table = connection.getTable(tableName)) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>      Put put = createPutForStartCode(startCode.toString(), backupRoot);<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      table.put(put);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    }<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  /**<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   * Get the Region Servers log information after the last log roll from backup system table.<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   * @param backupRoot root directory path to backup<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   * @return RS log info<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * @throws IOException exception<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>  public HashMap&lt;String, Long&gt; readRegionServerLastLogRollResult(String backupRoot)<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      throws IOException {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    if (LOG.isTraceEnabled()) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      LOG.trace("read region server last roll log result to backup system table");<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    }<a name="line.568"></a>
-<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span>    Scan scan = createScanForReadRegionServerLastLogRollResult(backupRoot);<a name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span>    try (Table table = connection.getTable(tableName);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        ResultScanner scanner = table.getScanner(scan)) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      Result res = null;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      HashMap&lt;String, Long&gt; rsTimestampMap = new HashMap&lt;String, Long&gt;();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      while ((res = scanner.next()) != null) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        res.advance();<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        Cell cell = res.current();<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        byte[] row = CellUtil.cloneRow(cell);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>        String server =<a name="line.580"></a>
-<span class="sourceLineNo">581</span>            getServerNameForReadRegionServerLastLogRollResult(row);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>        byte[] data = CellUtil.cloneValue(cell);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>        rsTimestampMap.put(server, Bytes.toLong(data));<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      return rsTimestampMap;<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    }<a name="line.586"></a>
-<span class="sourceLineNo">587</span>  }<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>  /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * Writes Region Server last roll log result (timestamp) to backup system table table<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param server Region Server name<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @param ts last log timestamp<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   * @param backupRoot root directory path to backup<a name="line.593"></a>
-<span class="sourceLineNo">594</span>   * @throws IOException exception<a name="line.594"></a>
-<span class="sourceLineNo">595</span>   */<a name="line.595"></a>
-<span class="sourceLineNo">596</span>  public void writeRegionServerLastLogRollResult(String server, Long ts, String backupRoot)<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    if (LOG.isTraceEnabled()) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      LOG.trace("write region server last roll log result to backup system table");<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    try (Table table = connection.getTable(tableName)) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      Put put =<a name="line.602"></a>
-<span class="sourceLineNo">603</span>          createPutForRegionServerLastLogRollResult(server, ts, backupRoot);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      table.put(put);<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    }<a name="line.605"></a>
+<span class="sourceLineNo">500</span>  /**<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   * Reads backup status object (instance of backup info) from backup system table table<a name="line.501"></a>
+<span class="sourceLineNo">502</span>   * @param backupId backup id<a name="line.502"></a>
+<span class="sourceLineNo">503</span>   * @return Current status of backup session or null<a name="line.503"></a>
+<span class="sourceLineNo">504</span>   */<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span>  public BackupInfo readBackupInfo(String backupId) throws IOException {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    if (LOG.isTraceEnabled()) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      LOG.trace("read backup status from backup system table for: " + backupId);<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>    try (Table table = connection.getTable(tableName)) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      Get get = createGetForBackupInfo(backupId);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      Result res = table.get(get);<a name="line.513"></a>
+<span class="sourceLineNo">514</span>      if (res.isEmpty()) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>        return null;<a name="line.515"></a>
+<span class="sourceLineNo">516</span>      }<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      return resultToBackupInfo(res);<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    }<a name="line.518"></a>
+<span class="sourceLineNo">519</span>  }<a name="line.519"></a>
+<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">521</span>  /**<a name="line.521"></a>
+<span class="sourceLineNo">522</span>   * Read the last backup start code (timestamp) of last successful backup. Will return null if<a name="line.522"></a>
+<span class="sourceLineNo">523</span>   * there is no start code stored on hbase or the value is of length 0. These two cases indicate<a name="line.523"></a>
+<span class="sourceLineNo">524</span>   * there is no successful backup completed so far.<a name="line.524"></a>
+<span class="sourceLineNo">525</span>   * @param backupRoot directory path to backup destination<a name="line.525"></a>
+<span class="sourceLineNo">526</span>   * @return the timestamp of last successful backup<a name="line.526"></a>
+<span class="sourceLineNo">527</span>   * @throws IOException exception<a name="line.527"></a>
+<span class="sourceLineNo">528</span>   */<a name="line.528"></a>
+<span class="sourceLineNo">529</span>  public String readBackupStartCode(String backupRoot) throws IOException {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    if (LOG.isTraceEnabled()) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      LOG.trace("read backup start code from backup system table");<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    }<a name="line.532"></a>
+<span class="sourceLineNo">533</span>    try (Table table = connection.getTable(tableName)) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      Get get = createGetForStartCode(backupRoot);<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      Result res = table.get(get);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      if (res.isEmpty()) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        return null;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      Cell cell = res.listCells().get(0);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      byte[] val = CellUtil.cloneValue(cell);<a name="line.540"></a>
+<span class="sourceLineNo">541</span>      if (val.length == 0) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        return null;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      return new String(val);<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>  }<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span>  /**<a name="line.548"></a>
+<span class="sourceLineNo">549</span>   * Write the start code (timestamp) to backup system table. If passed in null, then write 0 byte.<a name="line.549"></a>
+<span class="sourceLineNo">550</span>   * @param startCode start code<a name="line.550"></a>
+<span class="sourceLineNo">551</span>   * @param backupRoot root directory path to backup<a name="line.551"></a>
+<span class="sourceLineNo">552</span>   * @throws IOException exception<a name="line.552"></a>
+<span class="sourceLineNo">553</span>   */<a name="line.553"></a>
+<span class="sourceLineNo">554</span>  public void writeBackupStartCode(Long startCode, String backupRoot) throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    if (LOG.isTraceEnabled()) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      LOG.trace("write backup start code to backup system table " + startCode);<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    }<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    try (Table table = connection.getTable(tableName)) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      Put put = createPutForStartCode(startCode.toString(), b

<TRUNCATED>

Mime
View raw message