http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
index ee1e49b..4633124 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
@@ -152,7 +152,7 @@
 <span class="sourceLineNo">144</span>      conn = 
ConnectionFactory.createConnection(getConf());<a name="line.144"></a>
 <span class="sourceLineNo">145</span>      if (requiresNoActiveSession()) {<a 
name="line.145"></a>
 <span class="sourceLineNo">146</span>        // Check active session<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>        try (BackupSystemTable table = 
new BackupSystemTable(conn);) {<a name="line.147"></a>
+<span class="sourceLineNo">147</span>        try (BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.147"></a>
 <span class="sourceLineNo">148</span>          List&lt;BackupInfo&gt; sessions 
= table.getBackupInfos(BackupState.RUNNING);<a name="line.148"></a>
 <span class="sourceLineNo">149</span><a name="line.149"></a>
 <span class="sourceLineNo">150</span>          if (sessions.size() &gt; 0) {<a 
name="line.150"></a>
@@ -166,7 +166,7 @@
 <span class="sourceLineNo">158</span>      }<a name="line.158"></a>
 <span class="sourceLineNo">159</span>      if (requiresConsistentState()) {<a 
name="line.159"></a>
 <span class="sourceLineNo">160</span>        // Check failed delete<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>        try (BackupSystemTable table = 
new BackupSystemTable(conn);) {<a name="line.161"></a>
+<span class="sourceLineNo">161</span>        try (BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.161"></a>
 <span class="sourceLineNo">162</span>          String[] ids = 
table.getListOfBackupIdsFromDeleteOperation();<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
 <span class="sourceLineNo">164</span>          if (ids != null &amp;&amp; 
ids.length &gt; 0) {<a name="line.164"></a>
@@ -340,691 +340,689 @@
 <span class="sourceLineNo">332</span>        
System.setProperty("mapreduce.job.queuename", queueName);<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>      try (BackupAdminImpl admin = new 
BackupAdminImpl(conn);) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>        BackupRequest.Builder builder = 
new BackupRequest.Builder();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        BackupRequest request =<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>            builder<a name="line.339"></a>
-<span class="sourceLineNo">340</span>                
.withBackupType(BackupType.valueOf(args[1].toUpperCase()))<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>                .withTableList(<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>                  tables != null ? 
Lists.newArrayList(BackupUtils.parseTableNames(tables)) : null)<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>                
.withTargetRootDir(targetBackupDir).withTotalTasks(workers)<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>                
.withBandwidthPerTasks(bandwidth).withBackupSetName(setName).build();<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>        String backupId = 
admin.backupTables(request);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        System.out.println("Backup 
session " + backupId + " finished. Status: SUCCESS");<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      } catch (IOException e) {<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>        System.out.println("Backup 
session finished. Status: FAILURE");<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        throw e;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>    private boolean isRootFolder(String 
targetBackupDir) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      Path p = new 
Path(targetBackupDir);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      return p.isRoot();<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span>    private boolean verifyPath(String 
path) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      try {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        Path p = new Path(path);<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>        Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        URI uri = p.toUri();<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>        if (uri.getScheme() == null) 
return false;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>        FileSystem.get(uri, conf);<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>        return true;<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>      } catch (Exception e) {<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>        return false;<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><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    private String getTablesForSet(String 
name, Configuration conf) throws IOException {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      try (final BackupSystemTable table 
= new BackupSystemTable(conn)) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        List&lt;TableName&gt; tables = 
table.describeBackupSet(name);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        if (tables == null) return 
null;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        return StringUtils.join(tables, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>    @Override<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    protected void printUsage() {<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>      
System.out.println(CREATE_CMD_USAGE);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      Options options = new Options();<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      options.addOption(OPTION_WORKERS, 
true, OPTION_WORKERS_DESC);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      options.addOption(OPTION_BANDWIDTH, 
true, OPTION_BANDWIDTH_DESC);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      options.addOption(OPTION_SET, true, 
OPTION_SET_BACKUP_DESC);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      options.addOption(OPTION_TABLE, 
true, OPTION_TABLE_LIST_DESC);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      
options.addOption(OPTION_YARN_QUEUE_NAME, true, OPTION_YARN_QUEUE_NAME_DESC);<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>      options.addOption(OPTION_DEBUG, 
false, OPTION_DEBUG_DESC);<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>      HelpFormatter helpFormatter = new 
HelpFormatter();<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      helpFormatter.setLeftPadding(2);<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>      helpFormatter.setDescPadding(8);<a 
name="line.392"></a>
-<span class="sourceLineNo">393</span>      helpFormatter.setWidth(100);<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>      
helpFormatter.setSyntaxPrefix("Options:");<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      helpFormatter.printHelp(" ", null, 
options, USAGE_FOOTER);<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>  }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>  private static class HelpCommand 
extends Command {<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>    HelpCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      super(conf);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      this.cmdline = cmdline;<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>    @Override<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    public void execute() throws 
IOException {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      if (cmdline == null) {<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>        printUsage();<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>      String[] args = 
cmdline.getArgs();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      if (args == null || args.length == 
0) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        printUsage();<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>      if (args.length != 2) {<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>        System.out.println("ERROR: Only 
supports help message of a single command type");<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        printUsage();<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>        throw new 
IOException(INCORRECT_USAGE);<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>      String type = args[1];<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if 
(BackupCommand.CREATE.name().equalsIgnoreCase(type)) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        
System.out.println(CREATE_CMD_USAGE);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      } else if 
(BackupCommand.DESCRIBE.name().equalsIgnoreCase(type)) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        
System.out.println(DESCRIBE_CMD_USAGE);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      } else if 
(BackupCommand.HISTORY.name().equalsIgnoreCase(type)) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        
System.out.println(HISTORY_CMD_USAGE);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      } else if 
(BackupCommand.PROGRESS.name().equalsIgnoreCase(type)) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        
System.out.println(PROGRESS_CMD_USAGE);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      } else if 
(BackupCommand.DELETE.name().equalsIgnoreCase(type)) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        
System.out.println(DELETE_CMD_USAGE);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      } else if 
(BackupCommand.SET.name().equalsIgnoreCase(type)) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        
System.out.println(SET_CMD_USAGE);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>        System.out.println("Unknown 
command : " + type);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        printUsage();<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>      }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    @Override<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    protected void printUsage() {<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>      System.out.println(USAGE);<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>  private static class DescribeCommand 
extends Command {<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>    DescribeCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      super(conf);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      this.cmdline = cmdline;<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>    @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    public void execute() throws 
IOException {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      if (cmdline == null || 
cmdline.getArgs() == null) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        printUsage();<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      String[] args = 
cmdline.getArgs();<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      if (args.length != 2) {<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>        printUsage();<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span>      super.execute();<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>      String backupId = args[1];<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>      try (final BackupSystemTable 
sysTable = new BackupSystemTable(conn);) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>        BackupInfo info = 
sysTable.readBackupInfo(backupId);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        if (info == null) {<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>          System.out.println("ERROR: " + 
backupId + " does not exist");<a name="line.477"></a>
-<span class="sourceLineNo">478</span>          printUsage();<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>          throw new 
IOException(INCORRECT_USAGE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        }<a name="line.480"></a>
-<span class="sourceLineNo">481</span>        
System.out.println(info.getShortDescription());<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>    @Override<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    protected void printUsage() {<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>      
System.out.println(DESCRIBE_CMD_USAGE);<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>  private static class ProgressCommand 
extends Command {<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span>    ProgressCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      super(conf);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      this.cmdline = cmdline;<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>    @Override<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    public void execute() throws 
IOException {<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span>      if (cmdline == null || 
cmdline.getArgs() == null || cmdline.getArgs().length == 1) {<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>        System.out.println("No backup id 
was specified, "<a name="line.502"></a>
-<span class="sourceLineNo">503</span>            + "will retrieve the most 
recent (ongoing) session");<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      if (args != null &amp;&amp; 
args.length &gt; 2) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        System.err.println("ERROR: wrong 
number of arguments: " + args.length);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        printUsage();<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>        throw new 
IOException(INCORRECT_USAGE);<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>      super.execute();<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span>      String backupId = (args == null || 
args.length &lt;= 1) ? null : args[1];<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      try (final BackupSystemTable 
sysTable = new BackupSystemTable(conn);) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span>        BackupInfo info = null;<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>        if (backupId != null) {<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>          info = 
sysTable.readBackupInfo(backupId);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>        } else {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>          List&lt;BackupInfo&gt; infos = 
sysTable.getBackupInfos(BackupState.RUNNING);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>          if (infos != null &amp;&amp; 
infos.size() &gt; 0) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            info = infos.get(0);<a 
name="line.523"></a>
-<span class="sourceLineNo">524</span>            backupId = 
info.getBackupId();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>            System.out.println("Found 
ongoing session with backupId=" + backupId);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>          } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>          }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        }<a name="line.528"></a>
-<span class="sourceLineNo">529</span>        int progress = info == null ? -1 
: info.getProgress();<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        if (progress &lt; 0) {<a 
name="line.530"></a>
-<span class="sourceLineNo">531</span>          if (backupId != null) {<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>            
System.out.println(NO_INFO_FOUND + backupId);<a name="line.532"></a>
-<span class="sourceLineNo">533</span>          } else {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>            
System.err.println(NO_ACTIVE_SESSION_FOUND);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>          }<a name="line.535"></a>
-<span class="sourceLineNo">536</span>        } else {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>          System.out.println(backupId + " 
progress=" + progress + "%");<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        }<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>    @Override<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    protected void printUsage() {<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>      
System.out.println(PROGRESS_CMD_USAGE);<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>  private static class DeleteCommand 
extends Command {<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span>    DeleteCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.550"></a>
-<span class="sourceLineNo">551</span>      super(conf);<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      this.cmdline = cmdline;<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>    }<a name="line.553"></a>
-<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>    @Override<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    protected boolean 
requiresNoActiveSession() {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      return true;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span>    @Override<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    public void execute() throws 
IOException {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      if (cmdline == null || 
cmdline.getArgs() == null || cmdline.getArgs().length &lt; 2) {<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>        printUsage();<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      }<a name="line.565"></a>
-<span class="sourceLineNo">566</span><a name="line.566"></a>
-<span class="sourceLineNo">567</span>      super.execute();<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String[] args = 
cmdline.getArgs();<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      String[] backupIds = new 
String[args.length - 1];<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      System.arraycopy(args, 1, 
backupIds, 0, backupIds.length);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      try (BackupAdminImpl admin = new 
BackupAdminImpl(conn);) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        int deleted = 
admin.deleteBackups(backupIds);<a name="line.573"></a>
-<span class="sourceLineNo">574</span>        System.out.println("Deleted " + 
deleted + " backups. Total requested: " + (args.length -1));<a 
name="line.574"></a>
-<span class="sourceLineNo">575</span>      } catch (IOException e) {<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>        System.err<a name="line.576"></a>
-<span class="sourceLineNo">577</span>            .println("Delete command 
FAILED. Please run backup repair tool to restore backup system integrity");<a 
name="line.577"></a>
-<span class="sourceLineNo">578</span>        throw e;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span>    @Override<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    protected void printUsage() {<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>      
System.out.println(DELETE_CMD_USAGE);<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>  private static class RepairCommand 
extends Command {<a name="line.589"></a>
-<span class="sourceLineNo">590</span><a name="line.590"></a>
-<span class="sourceLineNo">591</span>    RepairCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      super(conf);<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      this.cmdline = cmdline;<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>    }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span>    @Override<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    public void execute() throws 
IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      super.execute();<a 
name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      if (args != null &amp;&amp; 
args.length &gt; 1) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>        System.err.println("ERROR: wrong 
number of arguments: " + args.length);<a name="line.602"></a>
-<span class="sourceLineNo">603</span>        printUsage();<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      }<a name="line.605"></a>
-<span class="sourceLineNo">606</span><a name="line.606"></a>
-<span class="sourceLineNo">607</span>      Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>          final BackupSystemTable 
sysTable = new BackupSystemTable(conn);) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span>        // Failed backup<a 
name="line.611"></a>
-<span class="sourceLineNo">612</span>        BackupInfo backupInfo;<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span>        List&lt;BackupInfo&gt; list = 
sysTable.getBackupInfos(BackupState.RUNNING);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        if (list.size() == 0) {<a 
name="line.614"></a>
-<span class="sourceLineNo">615</span>          // No failed sessions found<a 
name="line.615"></a>
-<span class="sourceLineNo">616</span>          System.out.println("REPAIR 
status: no failed sessions found."<a name="line.616"></a>
-<span class="sourceLineNo">617</span>              + " Checking failed delete 
backup operation ...");<a name="line.617"></a>
-<span class="sourceLineNo">618</span>          
repairFailedBackupDeletionIfAny(conn, sysTable);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>          
repairFailedBackupMergeIfAny(conn, sysTable);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          return;<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        }<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        backupInfo = list.get(0);<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>        // If this is a cancel exception, 
then we've already cleaned.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>        // set the failure timestamp of 
the overall backup<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        
backupInfo.setCompleteTs(EnvironmentEdgeManager.currentTime());<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>        // set failure message<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>        backupInfo.setFailedMsg("REPAIR 
status: repaired after failure:\n" + backupInfo);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        // set overall backup status: 
failed<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        
backupInfo.setState(BackupState.FAILED);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        // compose the backup failed 
data<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        String backupFailedData =<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>            "BackupId=" + 
backupInfo.getBackupId() + ",startts=" + backupInfo.getStartTs()<a 
name="line.632"></a>
-<span class="sourceLineNo">633</span>                + ",failedts=" + 
backupInfo.getCompleteTs() + ",failedphase="<a name="line.633"></a>
-<span class="sourceLineNo">634</span>                + backupInfo.getPhase() + 
",failedmessage=" + backupInfo.getFailedMsg();<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        
System.out.println(backupFailedData);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        
TableBackupClient.cleanupAndRestoreBackupSystem(conn, backupInfo, conf);<a 
name="line.636"></a>
-<span class="sourceLineNo">637</span>        // If backup session is updated 
to FAILED state - means we<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        // processed recovery already.<a 
name="line.638"></a>
-<span class="sourceLineNo">639</span>        
sysTable.updateBackupInfo(backupInfo);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        
sysTable.finishBackupExclusiveOperation();<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        System.out.println("REPAIR 
status: finished repair failed session:\n " + backupInfo);<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>      }<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span>    private void 
repairFailedBackupDeletionIfAny(Connection conn, BackupSystemTable sysTable)<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>        throws IOException {<a 
name="line.647"></a>
-<span class="sourceLineNo">648</span>      String[] backupIds = 
sysTable.getListOfBackupIdsFromDeleteOperation();<a name="line.648"></a>
-<span class="sourceLineNo">649</span>      if (backupIds == null || 
backupIds.length == 0) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>        System.out.println("No failed 
backup DELETE operation found");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>        // Delete backup table snapshot 
if exists<a name="line.651"></a>
-<span class="sourceLineNo">652</span>        
BackupSystemTable.deleteSnapshot(conn);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>        return;<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      }<a name="line.654"></a>
-<span class="sourceLineNo">655</span>      System.out.println("Found failed 
DELETE operation for: " + StringUtils.join(backupIds));<a name="line.655"></a>
-<span class="sourceLineNo">656</span>      System.out.println("Running DELETE 
again ...");<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      // Restore table from snapshot<a 
name="line.657"></a>
-<span class="sourceLineNo">658</span>      
BackupSystemTable.restoreFromSnapshot(conn);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      // Finish previous failed session<a 
name="line.659"></a>
-<span class="sourceLineNo">660</span>      
sysTable.finishBackupExclusiveOperation();<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      try (BackupAdmin admin = new 
BackupAdminImpl(conn);) {<a name="line.661"></a>
-<span class="sourceLineNo">662</span>        admin.deleteBackups(backupIds);<a 
name="line.662"></a>
-<span class="sourceLineNo">663</span>      }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      System.out.println("DELETE 
operation finished OK: " + StringUtils.join(backupIds));<a name="line.664"></a>
+<span class="sourceLineNo">335</span>      try (BackupAdminImpl admin = new 
BackupAdminImpl(conn)) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        BackupRequest.Builder builder = 
new BackupRequest.Builder();<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        BackupRequest request =<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>            builder<a name="line.338"></a>
+<span class="sourceLineNo">339</span>                
.withBackupType(BackupType.valueOf(args[1].toUpperCase()))<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>                .withTableList(<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>                  tables != null ? 
Lists.newArrayList(BackupUtils.parseTableNames(tables)) : null)<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>                
.withTargetRootDir(targetBackupDir).withTotalTasks(workers)<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>                
.withBandwidthPerTasks(bandwidth).withBackupSetName(setName).build();<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>        String backupId = 
admin.backupTables(request);<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        System.out.println("Backup 
session " + backupId + " finished. Status: SUCCESS");<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      } catch (IOException e) {<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>        System.out.println("Backup 
session finished. Status: FAILURE");<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        throw e;<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><a name="line.351"></a>
+<span class="sourceLineNo">352</span>    private boolean isRootFolder(String 
targetBackupDir) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      Path p = new 
Path(targetBackupDir);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      return p.isRoot();<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>    }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>    private boolean verifyPath(String 
path) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      try {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        Path p = new Path(path);<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>        Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        URI uri = p.toUri();<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>        if (uri.getScheme() == null) 
return false;<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        FileSystem.get(uri, conf);<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>        return true;<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>      } catch (Exception e) {<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>        return false;<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>    private String getTablesForSet(String 
name, Configuration conf) throws IOException {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      try (final BackupSystemTable table 
= new BackupSystemTable(conn)) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        List&lt;TableName&gt; tables = 
table.describeBackupSet(name);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        if (tables == null) return 
null;<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        return StringUtils.join(tables, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>    @Override<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    protected void printUsage() {<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>      
System.out.println(CREATE_CMD_USAGE);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      Options options = new Options();<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>      options.addOption(OPTION_WORKERS, 
true, OPTION_WORKERS_DESC);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      options.addOption(OPTION_BANDWIDTH, 
true, OPTION_BANDWIDTH_DESC);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      options.addOption(OPTION_SET, true, 
OPTION_SET_BACKUP_DESC);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      options.addOption(OPTION_TABLE, 
true, OPTION_TABLE_LIST_DESC);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      
options.addOption(OPTION_YARN_QUEUE_NAME, true, OPTION_YARN_QUEUE_NAME_DESC);<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>      options.addOption(OPTION_DEBUG, 
false, OPTION_DEBUG_DESC);<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>      HelpFormatter helpFormatter = new 
HelpFormatter();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      helpFormatter.setLeftPadding(2);<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>      helpFormatter.setDescPadding(8);<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      helpFormatter.setWidth(100);<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>      
helpFormatter.setSyntaxPrefix("Options:");<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      helpFormatter.printHelp(" ", null, 
options, USAGE_FOOTER);<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>  }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span>  private static class HelpCommand 
extends Command {<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>    HelpCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      super(conf);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      this.cmdline = cmdline;<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    @Override<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    public void execute() throws 
IOException {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      if (cmdline == null) {<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>        printUsage();<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>      String[] args = 
cmdline.getArgs();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      if (args == null || args.length == 
0) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        printUsage();<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>      if (args.length != 2) {<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>        System.out.println("ERROR: Only 
supports help message of a single command type");<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        printUsage();<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>        throw new 
IOException(INCORRECT_USAGE);<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>      String type = args[1];<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>      if 
(BackupCommand.CREATE.name().equalsIgnoreCase(type)) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>        
System.out.println(CREATE_CMD_USAGE);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      } else if 
(BackupCommand.DESCRIBE.name().equalsIgnoreCase(type)) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        
System.out.println(DESCRIBE_CMD_USAGE);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      } else if 
(BackupCommand.HISTORY.name().equalsIgnoreCase(type)) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        
System.out.println(HISTORY_CMD_USAGE);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      } else if 
(BackupCommand.PROGRESS.name().equalsIgnoreCase(type)) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        
System.out.println(PROGRESS_CMD_USAGE);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      } else if 
(BackupCommand.DELETE.name().equalsIgnoreCase(type)) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        
System.out.println(DELETE_CMD_USAGE);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      } else if 
(BackupCommand.SET.name().equalsIgnoreCase(type)) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        
System.out.println(SET_CMD_USAGE);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      } else {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        System.out.println("Unknown 
command : " + type);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>        printUsage();<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><a name="line.444"></a>
+<span class="sourceLineNo">445</span>    @Override<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    protected void printUsage() {<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>      System.out.println(USAGE);<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><a name="line.450"></a>
+<span class="sourceLineNo">451</span>  private static class DescribeCommand 
extends Command {<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span>    DescribeCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      super(conf);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      this.cmdline = cmdline;<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>    @Override<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    public void execute() throws 
IOException {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      if (cmdline == null || 
cmdline.getArgs() == null) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span>        printUsage();<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      String[] args = 
cmdline.getArgs();<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      if (args.length != 2) {<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>        printUsage();<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>        throw new 
IOException(INCORRECT_USAGE);<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>      super.execute();<a 
name="line.470"></a>
+<span class="sourceLineNo">471</span><a name="line.471"></a>
+<span class="sourceLineNo">472</span>      String backupId = args[1];<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>      try (final BackupSystemTable 
sysTable = new BackupSystemTable(conn)) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        BackupInfo info = 
sysTable.readBackupInfo(backupId);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>        if (info == null) {<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>          System.out.println("ERROR: " + 
backupId + " does not exist");<a name="line.476"></a>
+<span class="sourceLineNo">477</span>          printUsage();<a 
name="line.477"></a>
+<span class="sourceLineNo">478</span>          throw new 
IOException(INCORRECT_USAGE);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>        }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>        
System.out.println(info.getShortDescription());<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      }<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>    @Override<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    protected void printUsage() {<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>      
System.out.println(DESCRIBE_CMD_USAGE);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    }<a name="line.487"></a>
+<span class="sourceLineNo">488</span>  }<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>  private static class ProgressCommand 
extends Command {<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>    ProgressCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>      super(conf);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      this.cmdline = cmdline;<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>    @Override<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    public void execute() throws 
IOException {<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (cmdline == null || 
cmdline.getArgs() == null || cmdline.getArgs().length == 1) {<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>        System.out.println("No backup id 
was specified, "<a name="line.501"></a>
+<span class="sourceLineNo">502</span>            + "will retrieve the most 
recent (ongoing) session");<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      if (args != null &amp;&amp; 
args.length &gt; 2) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span>        System.err.println("ERROR: wrong 
number of arguments: " + args.length);<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        printUsage();<a 
name="line.507"></a>
+<span class="sourceLineNo">508</span>        throw new 
IOException(INCORRECT_USAGE);<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>      super.execute();<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>      String backupId = (args == null || 
args.length &lt;= 1) ? null : args[1];<a name="line.513"></a>
+<span class="sourceLineNo">514</span>      try (final BackupSystemTable 
sysTable = new BackupSystemTable(conn)) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>        BackupInfo info = null;<a 
name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>        if (backupId != null) {<a 
name="line.517"></a>
+<span class="sourceLineNo">518</span>          info = 
sysTable.readBackupInfo(backupId);<a name="line.518"></a>
+<span class="sourceLineNo">519</span>        } else {<a name="line.519"></a>
+<span class="sourceLineNo">520</span>          List&lt;BackupInfo&gt; infos = 
sysTable.getBackupInfos(BackupState.RUNNING);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>          if (infos != null &amp;&amp; 
infos.size() &gt; 0) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>            info = infos.get(0);<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span>            backupId = 
info.getBackupId();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            System.out.println("Found 
ongoing session with backupId=" + backupId);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>          } else {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>          }<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        }<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        int progress = info == null ? -1 
: info.getProgress();<a name="line.528"></a>
+<span class="sourceLineNo">529</span>        if (progress &lt; 0) {<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>          if (backupId != null) {<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>            
System.out.println(NO_INFO_FOUND + backupId);<a name="line.531"></a>
+<span class="sourceLineNo">532</span>          } else {<a name="line.532"></a>
+<span class="sourceLineNo">533</span>            
System.err.println(NO_ACTIVE_SESSION_FOUND);<a name="line.533"></a>
+<span class="sourceLineNo">534</span>          }<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        } else {<a name="line.535"></a>
+<span class="sourceLineNo">536</span>          System.out.println(backupId + " 
progress=" + progress + "%");<a name="line.536"></a>
+<span class="sourceLineNo">537</span>        }<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      }<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>    @Override<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    protected void printUsage() {<a 
name="line.542"></a>
+<span class="sourceLineNo">543</span>      
System.out.println(PROGRESS_CMD_USAGE);<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    }<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>  private static class DeleteCommand 
extends Command {<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>    DeleteCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      super(conf);<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      this.cmdline = cmdline;<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>    }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>    @Override<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    protected boolean 
requiresNoActiveSession() {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      return true;<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>    @Override<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    public void execute() throws 
IOException {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      if (cmdline == null || 
cmdline.getArgs() == null || cmdline.getArgs().length &lt; 2) {<a 
name="line.561"></a>
+<span class="sourceLineNo">562</span>        printUsage();<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>      }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span>      super.execute();<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>      String[] args = 
cmdline.getArgs();<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      String[] backupIds = new 
String[args.length - 1];<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      System.arraycopy(args, 1, 
backupIds, 0, backupIds.length);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      try (BackupAdminImpl admin = new 
BackupAdminImpl(conn)) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span>        int deleted = 
admin.deleteBackups(backupIds);<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        System.out.println("Deleted " + 
deleted + " backups. Total requested: " + (args.length -1));<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span>      } catch (IOException e) {<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>        System.err<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            .println("Delete command 
FAILED. Please run backup repair tool to restore backup system integrity");<a 
name="line.576"></a>
+<span class="sourceLineNo">577</span>        throw e;<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      }<a name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>    }<a name="line.580"></a>
+<span class="sourceLineNo">581</span><a name="line.581"></a>
+<span class="sourceLineNo">582</span>    @Override<a name="line.582"></a>
+<span class="sourceLineNo">583</span>    protected void printUsage() {<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>      
System.out.println(DELETE_CMD_USAGE);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<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>  private static class RepairCommand 
extends Command {<a name="line.588"></a>
+<span class="sourceLineNo">589</span><a name="line.589"></a>
+<span class="sourceLineNo">590</span>    RepairCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      super(conf);<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      this.cmdline = cmdline;<a 
name="line.592"></a>
+<span class="sourceLineNo">593</span>    }<a name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span>    @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>    public void execute() throws 
IOException {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      super.execute();<a 
name="line.597"></a>
+<span class="sourceLineNo">598</span><a name="line.598"></a>
+<span class="sourceLineNo">599</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      if (args != null &amp;&amp; 
args.length &gt; 1) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span>        System.err.println("ERROR: wrong 
number of arguments: " + args.length);<a name="line.601"></a>
+<span class="sourceLineNo">602</span>        printUsage();<a 
name="line.602"></a>
+<span class="sourceLineNo">603</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      }<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span>      Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.607"></a>
+<span class="sourceLineNo">608</span>          final BackupSystemTable 
sysTable = new BackupSystemTable(conn)) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>        // Failed backup<a 
name="line.609"></a>
+<span class="sourceLineNo">610</span>        BackupInfo backupInfo;<a 
name="line.610"></a>
+<span class="sourceLineNo">611</span>        List&lt;BackupInfo&gt; list = 
sysTable.getBackupInfos(BackupState.RUNNING);<a name="line.611"></a>
+<span class="sourceLineNo">612</span>        if (list.size() == 0) {<a 
name="line.612"></a>
+<span class="sourceLineNo">613</span>          // No failed sessions found<a 
name="line.613"></a>
+<span class="sourceLineNo">614</span>          System.out.println("REPAIR 
status: no failed sessions found."<a name="line.614"></a>
+<span class="sourceLineNo">615</span>              + " Checking failed delete 
backup operation ...");<a name="line.615"></a>
+<span class="sourceLineNo">616</span>          
repairFailedBackupDeletionIfAny(conn, sysTable);<a name="line.616"></a>
+<span class="sourceLineNo">617</span>          
repairFailedBackupMergeIfAny(conn, sysTable);<a name="line.617"></a>
+<span class="sourceLineNo">618</span>          return;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>        }<a name="line.619"></a>
+<span class="sourceLineNo">620</span>        backupInfo = list.get(0);<a 
name="line.620"></a>
+<span class="sourceLineNo">621</span>        // If this is a cancel exception, 
then we've already cleaned.<a name="line.621"></a>
+<span class="sourceLineNo">622</span>        // set the failure timestamp of 
the overall backup<a name="line.622"></a>
+<span class="sourceLineNo">623</span>        
backupInfo.setCompleteTs(EnvironmentEdgeManager.currentTime());<a 
name="line.623"></a>
+<span class="sourceLineNo">624</span>        // set failure message<a 
name="line.624"></a>
+<span class="sourceLineNo">625</span>        backupInfo.setFailedMsg("REPAIR 
status: repaired after failure:\n" + backupInfo);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>        // set overall backup status: 
failed<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        
backupInfo.setState(BackupState.FAILED);<a name="line.627"></a>
+<span class="sourceLineNo">628</span>        // compose the backup failed 
data<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        String backupFailedData =<a 
name="line.629"></a>
+<span class="sourceLineNo">630</span>            "BackupId=" + 
backupInfo.getBackupId() + ",startts=" + backupInfo.getStartTs()<a 
name="line.630"></a>
+<span class="sourceLineNo">631</span>                + ",failedts=" + 
backupInfo.getCompleteTs() + ",failedphase="<a name="line.631"></a>
+<span class="sourceLineNo">632</span>                + backupInfo.getPhase() + 
",failedmessage=" + backupInfo.getFailedMsg();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>        
System.out.println(backupFailedData);<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        
TableBackupClient.cleanupAndRestoreBackupSystem(conn, backupInfo, conf);<a 
name="line.634"></a>
+<span class="sourceLineNo">635</span>        // If backup session is updated 
to FAILED state - means we<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        // processed recovery already.<a 
name="line.636"></a>
+<span class="sourceLineNo">637</span>        
sysTable.updateBackupInfo(backupInfo);<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        
sysTable.finishBackupExclusiveOperation();<a name="line.638"></a>
+<span class="sourceLineNo">639</span>        System.out.println("REPAIR 
status: finished repair failed session:\n " + backupInfo);<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span><a name="line.640"></a>
+<span class="sourceLineNo">641</span>      }<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span>    private void 
repairFailedBackupDeletionIfAny(Connection conn, BackupSystemTable sysTable)<a 
name="line.644"></a>
+<span class="sourceLineNo">645</span>        throws IOException {<a 
name="line.645"></a>
+<span class="sourceLineNo">646</span>      String[] backupIds = 
sysTable.getListOfBackupIdsFromDeleteOperation();<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      if (backupIds == null || 
backupIds.length == 0) {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>        System.out.println("No failed 
backup DELETE operation found");<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        // Delete backup table snapshot 
if exists<a name="line.649"></a>
+<span class="sourceLineNo">650</span>        
BackupSystemTable.deleteSnapshot(conn);<a name="line.650"></a>
+<span class="sourceLineNo">651</span>        return;<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      }<a name="line.652"></a>
+<span class="sourceLineNo">653</span>      System.out.println("Found failed 
DELETE operation for: " + StringUtils.join(backupIds));<a name="line.653"></a>
+<span class="sourceLineNo">654</span>      System.out.println("Running DELETE 
again ...");<a name="line.654"></a>
+<span class="sourceLineNo">655</span>      // Restore table from snapshot<a 
name="line.655"></a>
+<span class="sourceLineNo">656</span>      
BackupSystemTable.restoreFromSnapshot(conn);<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      // Finish previous failed session<a 
name="line.657"></a>
+<span class="sourceLineNo">658</span>      
sysTable.finishBackupExclusiveOperation();<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      try (BackupAdmin admin = new 
BackupAdminImpl(conn)) {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>        admin.deleteBackups(backupIds);<a 
name="line.660"></a>
+<span class="sourceLineNo">661</span>      }<a name="line.661"></a>
+<span class="sourceLineNo">662</span>      System.out.println("DELETE 
operation finished OK: " + StringUtils.join(backupIds));<a name="line.662"></a>
+<span class="sourceLineNo">663</span><a name="line.663"></a>
+<span class="sourceLineNo">664</span>    }<a name="line.664"></a>
 <span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span>    }<a name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span>    private void 
repairFailedBackupMergeIfAny(Connection conn, BackupSystemTable sysTable)<a 
name="line.668"></a>
-<span class="sourceLineNo">669</span>        throws IOException {<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>      String[] backupIds = 
sysTable.getListOfBackupIdsFromMergeOperation();<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      if (backupIds == null || 
backupIds.length == 0) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span>        System.out.println("No failed 
backup MERGE operation found");<a name="line.672"></a>
-<span class="sourceLineNo">673</span>        // Delete backup table snapshot 
if exists<a name="line.673"></a>
-<span class="sourceLineNo">674</span>        
BackupSystemTable.deleteSnapshot(conn);<a name="line.674"></a>
-<span class="sourceLineNo">675</span>        return;<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      }<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      System.out.println("Found failed 
MERGE operation for: " + StringUtils.join(backupIds));<a name="line.677"></a>
-<span class="sourceLineNo">678</span>      System.out.println("Running MERGE 
again ...");<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      // Restore table from snapshot<a 
name="line.679"></a>
-<span class="sourceLineNo">680</span>      
BackupSystemTable.restoreFromSnapshot(conn);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>      // Unlock backupo system<a 
name="line.681"></a>
-<span class="sourceLineNo">682</span>      
sysTable.finishBackupExclusiveOperation();<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      // Finish previous failed session<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span>      sysTable.finishMergeOperation();<a 
name="line.684"></a>
-<span class="sourceLineNo">685</span>      try (BackupAdmin admin = new 
BackupAdminImpl(conn);) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span>        admin.mergeBackups(backupIds);<a 
name="line.686"></a>
-<span class="sourceLineNo">687</span>      }<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      System.out.println("MERGE operation 
finished OK: " + StringUtils.join(backupIds));<a name="line.688"></a>
+<span class="sourceLineNo">666</span>    private void 
repairFailedBackupMergeIfAny(Connection conn, BackupSystemTable sysTable)<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>        throws IOException {<a 
name="line.667"></a>
+<span class="sourceLineNo">668</span>      String[] backupIds = 
sysTable.getListOfBackupIdsFromMergeOperation();<a name="line.668"></a>
+<span class="sourceLineNo">669</span>      if (backupIds == null || 
backupIds.length == 0) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span>        System.out.println("No failed 
backup MERGE operation found");<a name="line.670"></a>
+<span class="sourceLineNo">671</span>        // Delete backup table snapshot 
if exists<a name="line.671"></a>
+<span class="sourceLineNo">672</span>        
BackupSystemTable.deleteSnapshot(conn);<a name="line.672"></a>
+<span class="sourceLineNo">673</span>        return;<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      }<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      System.out.println("Found failed 
MERGE operation for: " + StringUtils.join(backupIds));<a name="line.675"></a>
+<span class="sourceLineNo">676</span>      System.out.println("Running MERGE 
again ...");<a name="line.676"></a>
+<span class="sourceLineNo">677</span>      // Restore table from snapshot<a 
name="line.677"></a>
+<span class="sourceLineNo">678</span>      
BackupSystemTable.restoreFromSnapshot(conn);<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      // Unlock backupo system<a 
name="line.679"></a>
+<span class="sourceLineNo">680</span>      
sysTable.finishBackupExclusiveOperation();<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      // Finish previous failed session<a 
name="line.681"></a>
+<span class="sourceLineNo">682</span>      sysTable.finishMergeOperation();<a 
name="line.682"></a>
+<span class="sourceLineNo">683</span>      try (BackupAdmin admin = new 
BackupAdminImpl(conn)) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span>        admin.mergeBackups(backupIds);<a 
name="line.684"></a>
+<span class="sourceLineNo">685</span>      }<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      System.out.println("MERGE operation 
finished OK: " + StringUtils.join(backupIds));<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span>    }<a name="line.688"></a>
 <span class="sourceLineNo">689</span><a name="line.689"></a>
-<span class="sourceLineNo">690</span>    }<a name="line.690"></a>
-<span class="sourceLineNo">691</span><a name="line.691"></a>
-<span class="sourceLineNo">692</span>    @Override<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    protected void printUsage() {<a 
name="line.693"></a>
-<span class="sourceLineNo">694</span>      
System.out.println(REPAIR_CMD_USAGE);<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    }<a name="line.695"></a>
-<span class="sourceLineNo">696</span>  }<a name="line.696"></a>
+<span class="sourceLineNo">690</span>    @Override<a name="line.690"></a>
+<span class="sourceLineNo">691</span>    protected void printUsage() {<a 
name="line.691"></a>
+<span class="sourceLineNo">692</span>      
System.out.println(REPAIR_CMD_USAGE);<a name="line.692"></a>
+<span class="sourceLineNo">693</span>    }<a name="line.693"></a>
+<span class="sourceLineNo">694</span>  }<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span>  private static class MergeCommand 
extends Command {<a name="line.696"></a>
 <span class="sourceLineNo">697</span><a name="line.697"></a>
-<span class="sourceLineNo">698</span>  private static class MergeCommand 
extends Command {<a name="line.698"></a>
-<span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span>    MergeCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span>      super(conf);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>      this.cmdline = cmdline;<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>    }<a name="line.703"></a>
-<span class="sourceLineNo">704</span><a name="line.704"></a>
-<span class="sourceLineNo">705</span>    @Override<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    protected boolean 
requiresNoActiveSession() {<a name="line.706"></a>
-<span class="sourceLineNo">707</span>      return true;<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    }<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>    @Override<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    protected boolean 
requiresConsistentState() {<a name="line.711"></a>
-<span class="sourceLineNo">712</span>      return true;<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    }<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span>    @Override<a name="line.715"></a>
-<span class="sourceLineNo">716</span>    public void execute() throws 
IOException {<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      super.execute();<a 
name="line.717"></a>
-<span class="sourceLineNo">718</span><a name="line.718"></a>
-<span class="sourceLineNo">719</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.719"></a>
-<span class="sourceLineNo">720</span>      if (args == null || (args.length != 
2)) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span>        System.err.println("ERROR: wrong 
number of arguments: "<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            + (args == null ? null : 
args.length));<a name="line.722"></a>
-<span class="sourceLineNo">723</span>        printUsage();<a 
name="line.723"></a>
-<span class="sourceLineNo">724</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      }<a name="line.725"></a>
-<span class="sourceLineNo">726</span><a name="line.726"></a>
-<span class="sourceLineNo">727</span>      String[] backupIds = 
args[1].split(",");<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      if (backupIds.length &lt; 2) {<a 
name="line.728"></a>
-<span class="sourceLineNo">729</span>        String msg = "ERROR: can not 
merge a single backup image. "+<a name="line.729"></a>
-<span class="sourceLineNo">730</span>            "Number of images must be 
greater than 1.";<a name="line.730"></a>
-<span class="sourceLineNo">731</span>        System.err.println(msg);<a 
name="line.731"></a>
-<span class="sourceLineNo">732</span>        throw new IOException(msg);<a 
name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span>      }<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.735"></a>
-<span class="sourceLineNo">736</span>      try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>          final BackupAdminImpl admin = 
new BackupAdminImpl(conn);) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        admin.mergeBackups(backupIds);<a 
name="line.738"></a>
-<span class="sourceLineNo">739</span>      }<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    }<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>    @Override<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    protected void printUsage() {<a 
name="line.743"></a>
-<span class="sourceLineNo">744</span>      
System.out.println(MERGE_CMD_USAGE);<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    }<a name="line.745"></a>
-<span class="sourceLineNo">746</span>  }<a name="line.746"></a>
+<span class="sourceLineNo">698</span>    MergeCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      super(conf);<a name="line.699"></a>
+<span class="sourceLineNo">700</span>      this.cmdline = cmdline;<a 
name="line.700"></a>
+<span class="sourceLineNo">701</span>    }<a name="line.701"></a>
+<span class="sourceLineNo">702</span><a name="line.702"></a>
+<span class="sourceLineNo">703</span>    @Override<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    protected boolean 
requiresNoActiveSession() {<a name="line.704"></a>
+<span class="sourceLineNo">705</span>      return true;<a name="line.705"></a>
+<span class="sourceLineNo">706</span>    }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>    @Override<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    protected boolean 
requiresConsistentState() {<a name="line.709"></a>
+<span class="sourceLineNo">710</span>      return true;<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    }<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>    @Override<a name="line.713"></a>
+<span class="sourceLineNo">714</span>    public void execute() throws 
IOException {<a name="line.714"></a>
+<span class="sourceLineNo">715</span>      super.execute();<a 
name="line.715"></a>
+<span class="sourceLineNo">716</span><a name="line.716"></a>
+<span class="sourceLineNo">717</span>      String[] args = cmdline == null ? 
null : cmdline.getArgs();<a name="line.717"></a>
+<span class="sourceLineNo">718</span>      if (args == null || (args.length != 
2)) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>        System.err.println("ERROR: wrong 
number of arguments: "<a name="line.719"></a>
+<span class="sourceLineNo">720</span>            + (args == null ? null : 
args.length));<a name="line.720"></a>
+<span class="sourceLineNo">721</span>        printUsage();<a 
name="line.721"></a>
+<span class="sourceLineNo">722</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.722"></a>
+<span class="sourceLineNo">723</span>      }<a name="line.723"></a>
+<span class="sourceLineNo">724</span><a name="line.724"></a>
+<span class="sourceLineNo">725</span>      String[] backupIds = 
args[1].split(",");<a name="line.725"></a>
+<span class="sourceLineNo">726</span>      if (backupIds.length &lt; 2) {<a 
name="line.726"></a>
+<span class="sourceLineNo">727</span>        String msg = "ERROR: can not 
merge a single backup image. "+<a name="line.727"></a>
+<span class="sourceLineNo">728</span>            "Number of images must be 
greater than 1.";<a name="line.728"></a>
+<span class="sourceLineNo">729</span>        System.err.println(msg);<a 
name="line.729"></a>
+<span class="sourceLineNo">730</span>        throw new IOException(msg);<a 
name="line.730"></a>
+<span class="sourceLineNo">731</span><a name="line.731"></a>
+<span class="sourceLineNo">732</span>      }<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      Configuration conf = getConf() != 
null ? getConf() : HBaseConfiguration.create();<a name="line.733"></a>
+<span class="sourceLineNo">734</span>      try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>          final BackupAdminImpl admin = 
new BackupAdminImpl(conn)) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>        admin.mergeBackups(backupIds);<a 
name="line.736"></a>
+<span class="sourceLineNo">737</span>      }<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    }<a name="line.738"></a>
+<span class="sourceLineNo">739</span><a name="line.739"></a>
+<span class="sourceLineNo">740</span>    @Override<a name="line.740"></a>
+<span class="sourceLineNo">741</span>    protected void printUsage() {<a 
name="line.741"></a>
+<span class="sourceLineNo">742</span>      
System.out.println(MERGE_CMD_USAGE);<a name="line.742"></a>
+<span class="sourceLineNo">743</span>    }<a name="line.743"></a>
+<span class="sourceLineNo">744</span>  }<a name="line.744"></a>
+<span class="sourceLineNo">745</span><a name="line.745"></a>
+<span class="sourceLineNo">746</span>  private static class HistoryCommand 
extends Command {<a name="line.746"></a>
 <span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span>  private static class HistoryCommand 
extends Command {<a name="line.748"></a>
+<span class="sourceLineNo">748</span>    private final static int 
DEFAULT_HISTORY_LENGTH = 10;<a name="line.748"></a>
 <span class="sourceLineNo">749</span><a name="line.749"></a>
-<span class="sourceLineNo">750</span>    private final static int 
DEFAULT_HISTORY_LENGTH = 10;<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>    HistoryCommand(Configuration conf, 
CommandLine cmdline) {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      super(conf);<a name="line.753"></a>
-<span class="sourceLineNo">754</span>      this.cmdline = cmdline;<a 
name="line.754"></a>
-<span class="sourceLineNo">755</span>    }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span>    @Override<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    public void execute() throws 
IOException {<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span>      int n = parseHistoryLength();<a 
name="line.760"></a>
-<span class="sourceLineNo">761</span>      final TableName tableName = 
getTableName();<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      final String setName = 
getTableSetName();<a name="line.762"></a>
-<span class="sourceLineNo">763</span>      BackupInfo.Filter tableNameFilter = 
new BackupInfo.Filter() {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>        @Override<a name="line.764"></a>
-<span class="sourceLineNo">765</span>        public boolean apply(BackupInfo 
info) {<a name="line.765"></a>
-<span class="sourceLineNo">766</span>          if (tableName == null) return 
true;<a name="line.766"></a>
-<span class="sourceLineNo">767</span>          List&lt;TableName&gt; names = 
info.getTableNames();<a name="line.767"></a>
-<span class="sourceLineNo">768</span>          return 
names.contains(tableName);<a name="line.768"></a>
-<span class="sourceLineNo">769</span>        }<a name="line.769"></a>
-<span class="sourceLineNo">770</span>      };<a name="line.770"></a>
-<span class="sourceLineNo">771</span>      BackupInfo.Filter tableSetFilter = 
new BackupInfo.Filter() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>        @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span>        public boolean apply(BackupInfo 
info) {<a name="line.773"></a>
-<span class="sourceLineNo">774</span>          if (setName == null) return 
true;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>          String backupId = 
info.getBackupId();<a name="line.775"></a>
-<span class="sourceLineNo">776</span>          return 
backupId.startsWith(setName);<a name="line.776"></a>
-<span class="sourceLineNo">777</span>        }<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      };<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      Path backupRootPath = 
getBackupRootPath();<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      List&lt;BackupInfo&gt; history = 
null;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      if (backupRootPath == null) {<a 
name="line.781"></a>
-<span class="sourceLineNo">782</span>        // Load from backup system 
table<a name="line.782"></a>
-<span class="sourceLineNo">783</span>        super.execute();<a 
name="line.783"></a>
-<span class="sourceLineNo">784</span>        try (final BackupSystemTable 
sysTable = new BackupSystemTable(conn);) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span>          history = 
sysTable.getBackupHistory(n, tableNameFilter, tableSetFilter);<a 
name="line.785"></a>
-<span class="sourceLineNo">786</span>        }<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      } else {<a name="line.787"></a>
-<span class="sourceLineNo">788</span>        // load from backup FS<a 
name="line.788"></a>
-<span class="sourceLineNo">789</span>        history =<a name="line.789"></a>
-<span class="sourceLineNo">790</span>            
BackupUtils.getHistory(getConf(), n, backupRootPath, tableNameFilter, 
tableSetFilter);<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      }<a name="line.791"></a>
-<span class="sourceLineNo">792</span>      for (BackupInfo info : history) {<a 
name="line.792"></a>
-<span class="sourceLineNo">793</span>        
System.out.println(info.getShortDescription());<a name="line.793"></a>
-<span class="sourceLineNo">794</span>      }<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    }<a name="line.795"></a>
-<span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span>    private Path getBackupRootPath() 
throws IOException {<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      String value = null;<a 
name="line.798"></a>
-<span class="sourceLineNo">799</span>      try {<a name="line.799"></a>
-<span class="sourceLineNo">800</span>        value = 
cmdline.getOptionValue(OPTION_PATH);<a name="line.800"></a>
-<span class="sourceLineNo">801</span>        if (value == null) return null;<a 
name="line.801"></a>
-<span class="sourceLineNo">802</span>        return new Path(value);<a 
name="line.802"></a>
-<span class="sourceLineNo">803</span>      } catch (IllegalArgumentException 
e) {<a name="line.803"></a>
-<span class="sourceLineNo">804</span>        System.out.println("ERROR: 
Illegal argument for backup root path: " + value);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>        printUsage();<a 
name="line.805"></a>
-<span class="sourceLineNo">806</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      }<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>    private TableName getTableName() 
throws IOException {<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      String value = 
cmdline.getOptionValue(OPTION_TABLE);<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      if (value == null) return null;<a 
name="line.812"></a>
-<span class="sourceLineNo">813</span>      try {<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        return 
TableName.valueOf(value);<a name="line.814"></a>
-<span class="sourceLineNo">815</span>      } catch (IllegalArgumentException 
e) {<a name="line.815"></a>
-<span class="sourceLineNo">816</span>        System.out.println("Illegal 
argument for table name: " + value);<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        printUsage();<a 
name="line.817"></a>
-<span class="sourceLineNo">818</span>        throw new 
IOException(INCORRECT_USAGE);<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      }<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    }<a name="line.820"></a>
-<span class="sourceLineNo">821</span><a name="line.821"></a>
-<span class="sourceLineNo">822</span>    private String getTableSetName() 
throws IOException {<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      String value = 
cmdline.getOptionValue(OPTION_SET);<a name="line.823"></a>
-<span class="sourceLineNo">824</span>      return value;<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    }<a name="line.825"></a>
-<span class="sourceLineNo">826</span><a name="line.826"></a>
-<span class="sourceLineNo">827</span>    private int parseHistoryLength() 
throws IOExcep

<TRUNCATED>

Reply via email to