http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e0fb1fde/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupDriver.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupDriver.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupDriver.html
index f71cea0..65c1a1f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupDriver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupDriver.html
@@ -45,180 +45,181 @@
 <span class="sourceLineNo">037</span>import java.io.IOException;<a 
name="line.37"></a>
 <span class="sourceLineNo">038</span>import java.net.URI;<a name="line.38"></a>
 <span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.commons.cli.CommandLine;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.fs.Path;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.backup.impl.BackupCommands;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.log4j.Level;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.log4j.LogManager;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.slf4j.Logger;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.slf4j.LoggerFactory;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>/**<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * Command-line entry point for backup 
operation<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>public class BackupDriver extends 
AbstractHBaseTool {<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BackupDriver.class);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private CommandLine cmd;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public BackupDriver() throws 
IOException {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    init();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected void init() throws 
IOException {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // disable irrelevant loggers to 
avoid it mess up command output<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    
LogUtils.disableZkAndClientLoggers();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  private int parseAndRun(String[] args) 
throws IOException {<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>    // Check if backup is enabled<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>    if 
(!BackupManager.isBackupEnabled(getConf())) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      
System.err.println(BackupRestoreConstants.ENABLE_BACKUP);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return -1;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>    
System.out.println(BackupRestoreConstants.VERIFY_BACKUP);<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>    String cmd = null;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>    String[] remainArgs = null;<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    if (args == null || args.length == 0) 
{<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      printToolUsage();<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>      return -1;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    } else {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      cmd = args[0];<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      remainArgs = new String[args.length 
- 1];<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      if (args.length &gt; 1) {<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>        System.arraycopy(args, 1, 
remainArgs, 0, args.length - 1);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>    BackupCommand type = 
BackupCommand.HELP;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    if 
(BackupCommand.CREATE.name().equalsIgnoreCase(cmd)) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      type = BackupCommand.CREATE;<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    } else if 
(BackupCommand.HELP.name().equalsIgnoreCase(cmd)) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      type = BackupCommand.HELP;<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    } else if 
(BackupCommand.DELETE.name().equalsIgnoreCase(cmd)) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      type = BackupCommand.DELETE;<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>    } else if 
(BackupCommand.DESCRIBE.name().equalsIgnoreCase(cmd)) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      type = BackupCommand.DESCRIBE;<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    } else if 
(BackupCommand.HISTORY.name().equalsIgnoreCase(cmd)) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      type = BackupCommand.HISTORY;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    } else if 
(BackupCommand.PROGRESS.name().equalsIgnoreCase(cmd)) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      type = BackupCommand.PROGRESS;<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    } else if 
(BackupCommand.SET.name().equalsIgnoreCase(cmd)) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      type = BackupCommand.SET;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>    } else if 
(BackupCommand.REPAIR.name().equalsIgnoreCase(cmd)) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      type = BackupCommand.REPAIR;<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    } else if 
(BackupCommand.MERGE.name().equalsIgnoreCase(cmd)) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      type = BackupCommand.MERGE;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    } else {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      System.out.println("Unsupported 
command for backup: " + cmd);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      printToolUsage();<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      return -1;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // enable debug logging<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    if (this.cmd.hasOption(OPTION_DEBUG)) 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    } else {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.INFO);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    BackupCommands.Command command = 
BackupCommands.createCommand(getConf(), type, this.cmd);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    if (type == BackupCommand.CREATE 
&amp;&amp; conf != null) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      ((BackupCommands.CreateCommand) 
command).setConf(conf);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      command.execute();<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    } catch (IOException e) {<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      if 
(e.getMessage().equals(BackupCommands.INCORRECT_USAGE)) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>        return -1;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      throw e;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    } finally {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      command.finish();<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return 0;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  protected void addOptions() {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    // define supported options<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    addOptNoArg(OPTION_DEBUG, 
OPTION_DEBUG_DESC);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    addOptWithArg(OPTION_TABLE, 
OPTION_TABLE_DESC);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    addOptWithArg(OPTION_BANDWIDTH, 
OPTION_BANDWIDTH_DESC);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    addOptWithArg(OPTION_WORKERS, 
OPTION_WORKERS_DESC);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    addOptWithArg(OPTION_RECORD_NUMBER, 
OPTION_RECORD_NUMBER_DESC);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    addOptWithArg(OPTION_SET, 
OPTION_SET_DESC);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    addOptWithArg(OPTION_PATH, 
OPTION_PATH_DESC);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    addOptWithArg(OPTION_YARN_QUEUE_NAME, 
OPTION_YARN_QUEUE_NAME_DESC);<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  protected void 
processOptions(CommandLine cmd) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    this.cmd = cmd;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  protected int doWork() throws Exception 
{<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    return parseAndRun(cmd.getArgs());<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>  public static void main(String[] args) 
throws Exception {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    Path hbasedir = 
FSUtils.getRootDir(conf);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    URI defaultFs = 
hbasedir.getFileSystem(conf).getUri();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    FSUtils.setFsDefault(conf, new 
Path(defaultFs));<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    int ret = ToolRunner.run(conf, new 
BackupDriver(), args);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    System.exit(ret);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>  @Override<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public int run(String[] args) throws 
IOException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    if (conf == null) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      LOG.error("Tool configuration is 
not initialized");<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      throw new 
NullPointerException("conf");<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    CommandLine cmd;<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    try {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      // parse the command line 
arguments<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      cmd = parseArgs(args);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      cmdLineArgs = args;<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    } catch (Exception e) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      System.err.println("Error when 
parsing command-line arguments: " + e.getMessage());<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      printToolUsage();<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>      return EXIT_FAILURE;<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    processOptions(cmd);<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    int ret = EXIT_FAILURE;<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    try {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      ret = doWork();<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    } catch (Exception e) {<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>      LOG.error("Error running 
command-line tool", e);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return EXIT_FAILURE;<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    return ret;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>  protected void printToolUsage() throws 
IOException {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    
System.out.println(BackupCommands.USAGE);<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">040</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.Path;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.backup.impl.BackupCommands;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.log4j.Level;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.log4j.LogManager;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.slf4j.Logger;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.slf4j.LoggerFactory;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>/**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * Command-line entry point for backup 
operation<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>@InterfaceAudience.Private<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>public class BackupDriver extends 
AbstractHBaseTool {<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BackupDriver.class);<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  private CommandLine cmd;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public BackupDriver() throws 
IOException {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    init();<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  protected void init() throws 
IOException {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    // disable irrelevant loggers to 
avoid it mess up command output<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    
LogUtils.disableZkAndClientLoggers();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  private int parseAndRun(String[] args) 
throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>    // Check if backup is enabled<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>    if 
(!BackupManager.isBackupEnabled(getConf())) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      
System.err.println(BackupRestoreConstants.ENABLE_BACKUP);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      return -1;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>    
System.out.println(BackupRestoreConstants.VERIFY_BACKUP);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>    String cmd = null;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    String[] remainArgs = null;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    if (args == null || args.length == 0) 
{<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      printToolUsage();<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      return -1;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    } else {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      cmd = args[0];<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      remainArgs = new String[args.length 
- 1];<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      if (args.length &gt; 1) {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>        System.arraycopy(args, 1, 
remainArgs, 0, args.length - 1);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    BackupCommand type = 
BackupCommand.HELP;<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    if 
(BackupCommand.CREATE.name().equalsIgnoreCase(cmd)) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      type = BackupCommand.CREATE;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    } else if 
(BackupCommand.HELP.name().equalsIgnoreCase(cmd)) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      type = BackupCommand.HELP;<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    } else if 
(BackupCommand.DELETE.name().equalsIgnoreCase(cmd)) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      type = BackupCommand.DELETE;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    } else if 
(BackupCommand.DESCRIBE.name().equalsIgnoreCase(cmd)) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      type = BackupCommand.DESCRIBE;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    } else if 
(BackupCommand.HISTORY.name().equalsIgnoreCase(cmd)) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      type = BackupCommand.HISTORY;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    } else if 
(BackupCommand.PROGRESS.name().equalsIgnoreCase(cmd)) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      type = BackupCommand.PROGRESS;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    } else if 
(BackupCommand.SET.name().equalsIgnoreCase(cmd)) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      type = BackupCommand.SET;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    } else if 
(BackupCommand.REPAIR.name().equalsIgnoreCase(cmd)) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      type = BackupCommand.REPAIR;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    } else if 
(BackupCommand.MERGE.name().equalsIgnoreCase(cmd)) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      type = BackupCommand.MERGE;<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    } else {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      System.out.println("Unsupported 
command for backup: " + cmd);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      printToolUsage();<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>      return -1;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    // enable debug logging<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    if (this.cmd.hasOption(OPTION_DEBUG)) 
{<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    } else {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.INFO);<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    BackupCommands.Command command = 
BackupCommands.createCommand(getConf(), type, this.cmd);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    if (type == BackupCommand.CREATE 
&amp;&amp; conf != null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      ((BackupCommands.CreateCommand) 
command).setConf(conf);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    try {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      command.execute();<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>    } catch (IOException e) {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      if 
(e.getMessage().equals(BackupCommands.INCORRECT_USAGE)) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        return -1;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      throw e;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    } finally {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      command.finish();<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    return 0;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>  @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  protected void addOptions() {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>    // define supported options<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    addOptNoArg(OPTION_DEBUG, 
OPTION_DEBUG_DESC);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    addOptWithArg(OPTION_TABLE, 
OPTION_TABLE_DESC);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    addOptWithArg(OPTION_BANDWIDTH, 
OPTION_BANDWIDTH_DESC);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    addOptWithArg(OPTION_WORKERS, 
OPTION_WORKERS_DESC);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    addOptWithArg(OPTION_RECORD_NUMBER, 
OPTION_RECORD_NUMBER_DESC);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    addOptWithArg(OPTION_SET, 
OPTION_SET_DESC);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    addOptWithArg(OPTION_PATH, 
OPTION_PATH_DESC);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    addOptWithArg(OPTION_YARN_QUEUE_NAME, 
OPTION_YARN_QUEUE_NAME_DESC);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  @Override<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  protected void 
processOptions(CommandLine cmd) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    this.cmd = cmd;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  protected int doWork() throws Exception 
{<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    return parseAndRun(cmd.getArgs());<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public static void main(String[] args) 
throws Exception {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    Path hbasedir = 
FSUtils.getRootDir(conf);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    URI defaultFs = 
hbasedir.getFileSystem(conf).getUri();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    FSUtils.setFsDefault(conf, new 
Path(defaultFs));<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    int ret = ToolRunner.run(conf, new 
BackupDriver(), args);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    System.exit(ret);<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  @Override<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  public int run(String[] args) throws 
IOException {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    if (conf == null) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      LOG.error("Tool configuration is 
not initialized");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      throw new 
NullPointerException("conf");<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>    CommandLine cmd;<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    try {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      // parse the command line 
arguments<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      cmd = parseArgs(args);<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      cmdLineArgs = args;<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>    } catch (Exception e) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      System.err.println("Error when 
parsing command-line arguments: " + e.getMessage());<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      printToolUsage();<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      return EXIT_FAILURE;<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    processOptions(cmd);<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>    int ret = EXIT_FAILURE;<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    try {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      ret = doWork();<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    } catch (Exception e) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      LOG.error("Error running 
command-line tool", e);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return EXIT_FAILURE;<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    return ret;<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>  protected void printToolUsage() throws 
IOException {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    
System.out.println(BackupCommands.USAGE);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span>}<a name="line.214"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e0fb1fde/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
index 7279ea9..4b58ed2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
@@ -44,244 +44,245 @@
 <span class="sourceLineNo">036</span>import java.net.URI;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import java.util.List;<a 
name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.commons.cli.CommandLine;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.commons.cli.HelpFormatter;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.commons.lang3.StringUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.fs.Path;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.log4j.Level;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.log4j.LogManager;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.slf4j.Logger;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.slf4j.LoggerFactory;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>/**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * Command-line entry point for restore 
operation<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>@InterfaceAudience.Private<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>public class RestoreDriver extends 
AbstractHBaseTool {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RestoreDriver.class);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  private CommandLine cmd;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private static final String 
USAGE_STRING =<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      "Usage: hbase restore 
&lt;backup_path&gt; &lt;backup_id&gt; [options]\n"<a name="line.72"></a>
-<span class="sourceLineNo">073</span>          + "  backup_path     Path to a 
backup destination root\n"<a name="line.73"></a>
-<span class="sourceLineNo">074</span>          + "  backup_id       Backup 
image ID to restore\n"<a name="line.74"></a>
-<span class="sourceLineNo">075</span>          + "  table(s)        
Comma-separated list of tables to restore\n";<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  private static final String 
USAGE_FOOTER = "";<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected RestoreDriver() throws 
IOException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    init();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  protected void init() {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    // disable irrelevant loggers to 
avoid it mess up command output<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    
LogUtils.disableZkAndClientLoggers();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  private int parseAndRun(String[] args) 
throws IOException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    // Check if backup is enabled<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    if 
(!BackupManager.isBackupEnabled(getConf())) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      
System.err.println(BackupRestoreConstants.ENABLE_BACKUP);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      return -1;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    
System.out.println(BackupRestoreConstants.VERIFY_BACKUP);<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    // enable debug logging<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>    if (cmd.hasOption(OPTION_DEBUG)) {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>    // whether to overwrite to existing 
table if any, false by default<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    boolean overwrite = 
cmd.hasOption(OPTION_OVERWRITE);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    if (overwrite) {<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>      LOG.debug("Found -overwrite option 
in restore command, "<a name="line.105"></a>
-<span class="sourceLineNo">106</span>          + "will overwrite to existing 
table if any in the restore target");<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    // whether to only check the 
dependencies, false by default<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    boolean check = 
cmd.hasOption(OPTION_CHECK);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    if (check) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      LOG.debug("Found -check option in 
restore command, "<a name="line.112"></a>
-<span class="sourceLineNo">113</span>          + "will check and verify the 
dependencies");<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>    if (cmd.hasOption(OPTION_SET) 
&amp;&amp; cmd.hasOption(OPTION_TABLE)) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      System.err.println("Options -s and 
-t are mutaully exclusive,"+<a name="line.117"></a>
-<span class="sourceLineNo">118</span>          " you can not specify both of 
them.");<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      printToolUsage();<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      return -1;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    if (!cmd.hasOption(OPTION_SET) 
&amp;&amp; !cmd.hasOption(OPTION_TABLE)) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      System.err.println("You have to 
specify either set name or table list to restore");<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      printToolUsage();<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>      return -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    if 
(cmd.hasOption(OPTION_YARN_QUEUE_NAME)) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      String queueName = 
cmd.getOptionValue(OPTION_YARN_QUEUE_NAME);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // Set system property value for MR 
job<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      
System.setProperty("mapreduce.job.queuename", queueName);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // parse main restore command 
options<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    String[] remainArgs = 
cmd.getArgs();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    if (remainArgs.length != 2) {<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      printToolUsage();<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      return -1;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    String backupRootDir = 
remainArgs[0];<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    String backupId = remainArgs[1];<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    String tables;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    String tableMapping =<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>        
cmd.hasOption(OPTION_TABLE_MAPPING) ? cmd.getOptionValue(OPTION_TABLE_MAPPING) 
: null;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        BackupAdmin client = new 
BackupAdminImpl(conn)) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      // Check backup set<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      if (cmd.hasOption(OPTION_SET)) {<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>        String setName = 
cmd.getOptionValue(OPTION_SET);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          tables = getTablesForSet(conn, 
setName, conf);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        } catch (IOException e) {<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          System.out.println("ERROR: " + 
e.getMessage() + " for setName=" + setName);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          printToolUsage();<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>          return -2;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>        }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        if (tables == null) {<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>          System.out.println("ERROR: 
Backup set '" + setName<a name="line.160"></a>
-<span class="sourceLineNo">161</span>              + "' is either empty or 
does not exist");<a name="line.161"></a>
-<span class="sourceLineNo">162</span>          printToolUsage();<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>          return -3;<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>        }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      } else {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        tables = 
cmd.getOptionValue(OPTION_TABLE);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>      TableName[] sTableArray = 
BackupUtils.parseTableNames(tables);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      TableName[] tTableArray = 
BackupUtils.parseTableNames(tableMapping);<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>      if (sTableArray != null &amp;&amp; 
tTableArray != null &amp;&amp;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>          (sTableArray.length != 
tTableArray.length)) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        System.out.println("ERROR: table 
mapping mismatch: " + tables + " : " + tableMapping);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        printToolUsage();<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>        return -4;<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>      
client.restore(BackupUtils.createRestoreRequest(backupRootDir, backupId, 
check,<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        sTableArray, tTableArray, 
overwrite));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    } catch (Exception e) {<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>      e.printStackTrace();<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>      return -5;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    return 0;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>  private String 
getTablesForSet(Connection conn, String name, Configuration conf)<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>      throws IOException {<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      List&lt;TableName&gt; tables = 
table.describeBackupSet(name);<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (tables == null) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        return null;<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>      return StringUtils.join(tables, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>  @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  protected void addOptions() {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    // define supported options<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    addOptNoArg(OPTION_OVERWRITE, 
OPTION_OVERWRITE_DESC);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    addOptNoArg(OPTION_CHECK, 
OPTION_CHECK_DESC);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    addOptNoArg(OPTION_DEBUG, 
OPTION_DEBUG_DESC);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    addOptWithArg(OPTION_SET, 
OPTION_SET_RESTORE_DESC);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    addOptWithArg(OPTION_TABLE, 
OPTION_TABLE_LIST_DESC);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    addOptWithArg(OPTION_TABLE_MAPPING, 
OPTION_TABLE_MAPPING_DESC);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    addOptWithArg(OPTION_YARN_QUEUE_NAME, 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC);<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>  @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  protected void 
processOptions(CommandLine cmd) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    this.cmd = cmd;<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>  @Override<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  protected int doWork() throws Exception 
{<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    return parseAndRun(cmd.getArgs());<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>  public static void main(String[] args) 
throws Exception {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    Path hbasedir = 
FSUtils.getRootDir(conf);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    URI defaultFs = 
hbasedir.getFileSystem(conf).getUri();<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    FSUtils.setFsDefault(conf, new 
Path(defaultFs));<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    int ret = ToolRunner.run(conf, new 
RestoreDriver(), args);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    System.exit(ret);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>  @Override<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  public int run(String[] args) {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    if (conf == null) {<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>      LOG.error("Tool configuration is 
not initialized");<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      throw new 
NullPointerException("conf");<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>    CommandLine cmd;<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>    try {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      // parse the command line 
arguments<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      cmd = parseArgs(args);<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      cmdLineArgs = args;<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    } catch (Exception e) {<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>      System.out.println("Error when 
parsing command-line arguments: " + e.getMessage());<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      printToolUsage();<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>      return EXIT_FAILURE;<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    if (cmd.hasOption(SHORT_HELP_OPTION) 
|| cmd.hasOption(LONG_HELP_OPTION)) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      printToolUsage();<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>      return EXIT_FAILURE;<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>    processOptions(cmd);<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>    int ret = EXIT_FAILURE;<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>    try {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      ret = doWork();<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>    } catch (Exception e) {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>      LOG.error("Error running 
command-line tool", e);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return EXIT_FAILURE;<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    return ret;<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>  protected void printToolUsage() {<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>    System.out.println(USAGE_STRING);<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    HelpFormatter helpFormatter = new 
HelpFormatter();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    helpFormatter.setLeftPadding(2);<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>    helpFormatter.setDescPadding(8);<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>    helpFormatter.setWidth(100);<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>    
helpFormatter.setSyntaxPrefix("Options:");<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    helpFormatter.printHelp(" ", null, 
options, USAGE_FOOTER);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>}<a name="line.276"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.commons.lang3.StringUtils;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.Path;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.log4j.Level;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.log4j.LogManager;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.Logger;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.LoggerFactory;<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>/**<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * Command-line entry point for restore 
operation<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *<a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>@InterfaceAudience.Private<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>public class RestoreDriver extends 
AbstractHBaseTool {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RestoreDriver.class);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  private CommandLine cmd;<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  private static final String 
USAGE_STRING =<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      "Usage: hbase restore 
&lt;backup_path&gt; &lt;backup_id&gt; [options]\n"<a name="line.73"></a>
+<span class="sourceLineNo">074</span>          + "  backup_path     Path to a 
backup destination root\n"<a name="line.74"></a>
+<span class="sourceLineNo">075</span>          + "  backup_id       Backup 
image ID to restore\n"<a name="line.75"></a>
+<span class="sourceLineNo">076</span>          + "  table(s)        
Comma-separated list of tables to restore\n";<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>  private static final String 
USAGE_FOOTER = "";<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  protected RestoreDriver() throws 
IOException {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    init();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  protected void init() {<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    // disable irrelevant loggers to 
avoid it mess up command output<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    
LogUtils.disableZkAndClientLoggers();<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  private int parseAndRun(String[] args) 
throws IOException {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    // Check if backup is enabled<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    if 
(!BackupManager.isBackupEnabled(getConf())) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      
System.err.println(BackupRestoreConstants.ENABLE_BACKUP);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      return -1;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>    
System.out.println(BackupRestoreConstants.VERIFY_BACKUP);<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>    // enable debug logging<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    if (cmd.hasOption(OPTION_DEBUG)) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>      
LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>    // whether to overwrite to existing 
table if any, false by default<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    boolean overwrite = 
cmd.hasOption(OPTION_OVERWRITE);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    if (overwrite) {<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>      LOG.debug("Found -overwrite option 
in restore command, "<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          + "will overwrite to existing 
table if any in the restore target");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    // whether to only check the 
dependencies, false by default<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    boolean check = 
cmd.hasOption(OPTION_CHECK);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (check) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      LOG.debug("Found -check option in 
restore command, "<a name="line.113"></a>
+<span class="sourceLineNo">114</span>          + "will check and verify the 
dependencies");<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (cmd.hasOption(OPTION_SET) 
&amp;&amp; cmd.hasOption(OPTION_TABLE)) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      System.err.println("Options -s and 
-t are mutaully exclusive,"+<a name="line.118"></a>
+<span class="sourceLineNo">119</span>          " you can not specify both of 
them.");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      printToolUsage();<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      return -1;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>    if (!cmd.hasOption(OPTION_SET) 
&amp;&amp; !cmd.hasOption(OPTION_TABLE)) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      System.err.println("You have to 
specify either set name or table list to restore");<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      printToolUsage();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>      return -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    if 
(cmd.hasOption(OPTION_YARN_QUEUE_NAME)) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      String queueName = 
cmd.getOptionValue(OPTION_YARN_QUEUE_NAME);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      // Set system property value for MR 
job<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      
System.setProperty("mapreduce.job.queuename", queueName);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>    // parse main restore command 
options<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    String[] remainArgs = 
cmd.getArgs();<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    if (remainArgs.length != 2) {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      printToolUsage();<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      return -1;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    String backupRootDir = 
remainArgs[0];<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    String backupId = remainArgs[1];<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    String tables;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    String tableMapping =<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>        
cmd.hasOption(OPTION_TABLE_MAPPING) ? cmd.getOptionValue(OPTION_TABLE_MAPPING) 
: null;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    try (final Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        BackupAdmin client = new 
BackupAdminImpl(conn)) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      // Check backup set<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      if (cmd.hasOption(OPTION_SET)) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>        String setName = 
cmd.getOptionValue(OPTION_SET);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        try {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          tables = getTablesForSet(conn, 
setName, conf);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        } catch (IOException e) {<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>          System.out.println("ERROR: " + 
e.getMessage() + " for setName=" + setName);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          printToolUsage();<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>          return -2;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>        }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        if (tables == null) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>          System.out.println("ERROR: 
Backup set '" + setName<a name="line.161"></a>
+<span class="sourceLineNo">162</span>              + "' is either empty or 
does not exist");<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          printToolUsage();<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>          return -3;<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      } else {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        tables = 
cmd.getOptionValue(OPTION_TABLE);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span>      TableName[] sTableArray = 
BackupUtils.parseTableNames(tables);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      TableName[] tTableArray = 
BackupUtils.parseTableNames(tableMapping);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>      if (sTableArray != null &amp;&amp; 
tTableArray != null &amp;&amp;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          (sTableArray.length != 
tTableArray.length)) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        System.out.println("ERROR: table 
mapping mismatch: " + tables + " : " + tableMapping);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        printToolUsage();<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>        return -4;<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>      
client.restore(BackupUtils.createRestoreRequest(backupRootDir, backupId, 
check,<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        sTableArray, tTableArray, 
overwrite));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    } catch (Exception e) {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>      e.printStackTrace();<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>      return -5;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    return 0;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>  private String 
getTablesForSet(Connection conn, String name, Configuration conf)<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>      throws IOException {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      List&lt;TableName&gt; tables = 
table.describeBackupSet(name);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>      if (tables == null) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>        return null;<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>      return StringUtils.join(tables, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND);<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>  @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span>  protected void addOptions() {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    // define supported options<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>    addOptNoArg(OPTION_OVERWRITE, 
OPTION_OVERWRITE_DESC);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    addOptNoArg(OPTION_CHECK, 
OPTION_CHECK_DESC);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    addOptNoArg(OPTION_DEBUG, 
OPTION_DEBUG_DESC);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    addOptWithArg(OPTION_SET, 
OPTION_SET_RESTORE_DESC);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    addOptWithArg(OPTION_TABLE, 
OPTION_TABLE_LIST_DESC);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    addOptWithArg(OPTION_TABLE_MAPPING, 
OPTION_TABLE_MAPPING_DESC);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    addOptWithArg(OPTION_YARN_QUEUE_NAME, 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC);<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>  protected void 
processOptions(CommandLine cmd) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    this.cmd = cmd;<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>  @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  protected int doWork() throws Exception 
{<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    return parseAndRun(cmd.getArgs());<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>  public static void main(String[] args) 
throws Exception {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    Path hbasedir = 
FSUtils.getRootDir(conf);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    URI defaultFs = 
hbasedir.getFileSystem(conf).getUri();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    FSUtils.setFsDefault(conf, new 
Path(defaultFs));<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    int ret = ToolRunner.run(conf, new 
RestoreDriver(), args);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    System.exit(ret);<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>  @Override<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  public int run(String[] args) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>    if (conf == null) {<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>      LOG.error("Tool configuration is 
not initialized");<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      throw new 
NullPointerException("conf");<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    CommandLine cmd;<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    try {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      // parse the command line 
arguments<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      cmd = parseArgs(args);<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>      cmdLineArgs = args;<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    } catch (Exception e) {<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>      System.out.println("Error when 
parsing command-line arguments: " + e.getMessage());<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      printToolUsage();<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>      return EXIT_FAILURE;<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    if (cmd.hasOption(SHORT_HELP_OPTION) 
|| cmd.hasOption(LONG_HELP_OPTION)) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      printToolUsage();<a 
name="line.252"></a>
+<span class="sourceLineNo">253</span>      return EXIT_FAILURE;<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>    processOptions(cmd);<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>    int ret = EXIT_FAILURE;<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>    try {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      ret = doWork();<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>    } catch (Exception e) {<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      LOG.error("Error running 
command-line tool", e);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return EXIT_FAILURE;<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    return ret;<a name="line.265"></a>
+<span class="sourceLineNo">266</span>  }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>  protected void printToolUsage() {<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>    System.out.println(USAGE_STRING);<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>    HelpFormatter helpFormatter = new 
HelpFormatter();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    helpFormatter.setLeftPadding(2);<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>    helpFormatter.setDescPadding(8);<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    helpFormatter.setWidth(100);<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>    
helpFormatter.setSyntaxPrefix("Options:");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    helpFormatter.printHelp(" ", null, 
options, USAGE_FOOTER);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
+<span class="sourceLineNo">277</span>}<a name="line.277"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e0fb1fde/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
index a12ad81..f236300 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
@@ -49,31 +49,31 @@
 <span class="sourceLineNo">041</span>import java.net.URI;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>import java.util.List;<a 
name="line.42"></a>
 <span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.commons.cli.CommandLine;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.commons.cli.HelpFormatter;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.commons.cli.Options;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.commons.lang3.StringUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.conf.Configured;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.fs.Path;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.backup.BackupAdmin;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.backup.BackupInfo;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.backup.BackupInfo.BackupState;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.backup.BackupRequest;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.backup.BackupType;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.backup.HBackupFileSystem;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.backup.util.BackupSet;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.68"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.commons.lang3.StringUtils;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.conf.Configured;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.fs.Path;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.backup.BackupAdmin;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.backup.BackupInfo;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.backup.BackupInfo.BackupState;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.backup.BackupRequest;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.backup.BackupType;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.backup.HBackupFileSystem;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.backup.util.BackupSet;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a 
name="line.68"></a>
 <span class="sourceLineNo">069</span><a name="line.69"></a>
 <span class="sourceLineNo">070</span>/**<a name="line.70"></a>
 <span class="sourceLineNo">071</span> * General backup commands, options and 
usage messages<a name="line.71"></a>

Reply via email to