http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupMergeJob.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupMergeJob.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupMergeJob.html
index 00b2c53..c96af49 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupMergeJob.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupMergeJob.html
@@ -38,11 +38,11 @@
 <span class="sourceLineNo">030</span><a name="line.30"></a>
 <span class="sourceLineNo">031</span>@InterfaceAudience.Private<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>public interface BackupMergeJob extends 
Configurable {<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>  /**<a name="line.34"></a>
-<span class="sourceLineNo">035</span>   * Run backup merge operation<a 
name="line.35"></a>
+<span class="sourceLineNo">033</span>  /**<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   * Run backup merge operation.<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>   *<a name="line.35"></a>
 <span class="sourceLineNo">036</span>   * @param backupIds backup image ids<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>   * @throws IOException<a 
name="line.37"></a>
+<span class="sourceLineNo">037</span>   * @throws IOException if the backup 
merge operation fails<a name="line.37"></a>
 <span class="sourceLineNo">038</span>   */<a name="line.38"></a>
 <span class="sourceLineNo">039</span>  void run(String[] backupIds) throws 
IOException;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>}<a name="line.40"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html
index 7e1a37b..e68377f 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html
@@ -37,105 +37,99 @@
 <span class="sourceLineNo">029</span>  /*<a name="line.29"></a>
 <span class="sourceLineNo">030</span>   * Backup/Restore constants<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>   */<a name="line.31"></a>
-<span class="sourceLineNo">032</span>  public final static String 
BACKUP_SYSTEM_TABLE_NAME_KEY = "hbase.backup.system.table.name";<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>  public final static String 
BACKUP_SYSTEM_TABLE_NAME_DEFAULT = "backup:system";<a name="line.33"></a>
+<span class="sourceLineNo">032</span>  String BACKUP_SYSTEM_TABLE_NAME_KEY = 
"hbase.backup.system.table.name";<a name="line.32"></a>
+<span class="sourceLineNo">033</span>  String BACKUP_SYSTEM_TABLE_NAME_DEFAULT 
= "backup:system";<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>  public final static String 
BACKUP_SYSTEM_TTL_KEY = "hbase.backup.system.ttl";<a name="line.35"></a>
+<span class="sourceLineNo">035</span>  String BACKUP_SYSTEM_TTL_KEY = 
"hbase.backup.system.ttl";<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>  public final static int 
BACKUP_SYSTEM_TTL_DEFAULT = HConstants.FOREVER;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public final static String 
BACKUP_ENABLE_KEY = "hbase.backup.enable";<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  public final static boolean 
BACKUP_ENABLE_DEFAULT = false;<a name="line.39"></a>
+<span class="sourceLineNo">037</span>  int BACKUP_SYSTEM_TTL_DEFAULT = 
HConstants.FOREVER;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  String BACKUP_ENABLE_KEY = 
"hbase.backup.enable";<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  boolean BACKUP_ENABLE_DEFAULT = 
false;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  public static final String 
BACKUP_MAX_ATTEMPTS_KEY = "hbase.backup.attempts.max";<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  public static final int 
DEFAULT_BACKUP_MAX_ATTEMPTS = 10;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public static final String 
BACKUP_ATTEMPTS_PAUSE_MS_KEY = "hbase.backup.attempts.pause.ms";<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  public static final int 
DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS = 10000;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  /*<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   *  Drivers option list<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>   */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final String 
OPTION_OVERWRITE = "o";<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  public static final String 
OPTION_OVERWRITE_DESC =<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      "Overwrite data if any of the 
restore target tables exists";<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public static final String OPTION_CHECK 
= "c";<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public static final String 
OPTION_CHECK_DESC =<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      "Check restore sequence and 
dependencies only (does not execute the command)";<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String OPTION_SET = 
"s";<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public static final String 
OPTION_SET_DESC = "Backup set name";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String 
OPTION_SET_RESTORE_DESC =<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      "Backup set to restore, mutually 
exclusive with -t (table list)";<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public static final String 
OPTION_SET_BACKUP_DESC =<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      "Backup set to backup, mutually 
exclusive with -t (table list)";<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static final String OPTION_DEBUG 
= "d";<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static final String 
OPTION_DEBUG_DESC = "Enable debug loggings";<a name="line.66"></a>
+<span class="sourceLineNo">041</span>  String BACKUP_MAX_ATTEMPTS_KEY = 
"hbase.backup.attempts.max";<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  int DEFAULT_BACKUP_MAX_ATTEMPTS = 10;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  String BACKUP_ATTEMPTS_PAUSE_MS_KEY = 
"hbase.backup.attempts.pause.ms";<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  int DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS = 
10000;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  /*<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   *  Drivers option list<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>   */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  String OPTION_OVERWRITE = "o";<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  String OPTION_OVERWRITE_DESC = 
"Overwrite data if any of the restore target tables exists";<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  String OPTION_CHECK = "c";<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>  String OPTION_CHECK_DESC =<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>      "Check restore sequence and 
dependencies only (does not execute the command)";<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  String OPTION_SET = "s";<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>  String OPTION_SET_DESC = "Backup set 
name";<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  String OPTION_SET_RESTORE_DESC = 
"Backup set to restore, mutually exclusive with -t (table list)";<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>  String OPTION_SET_BACKUP_DESC = "Backup 
set to backup, mutually exclusive with -t (table list)";<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  String OPTION_DEBUG = "d";<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  String OPTION_DEBUG_DESC = "Enable 
debug loggings";<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  String OPTION_TABLE = "t";<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>  String OPTION_TABLE_DESC = "Table name. 
If specified, only backup images,"<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      + " which contain this table will 
be listed.";<a name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  public static final String OPTION_TABLE 
= "t";<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public static final String 
OPTION_TABLE_DESC = "Table name. If specified, only backup images,"<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      + " which contain this table will 
be listed.";<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public static final String 
OPTION_TABLE_LIST = "l";<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static final String 
OPTION_TABLE_LIST_DESC = "Table name list, comma-separated.";<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public static final String 
OPTION_BANDWIDTH = "b";<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public static final String 
OPTION_BANDWIDTH_DESC = "Bandwidth per task (MapReduce task) in MB/s";<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public static final String 
OPTION_WORKERS = "w";<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static final String 
OPTION_WORKERS_DESC = "Number of parallel MapReduce tasks to execute";<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public static final String 
OPTION_RECORD_NUMBER = "n";<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public static final String 
OPTION_RECORD_NUMBER_DESC =<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      "Number of records of backup 
history. Default: 10";<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static final String OPTION_PATH 
= "p";<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public static final String 
OPTION_PATH_DESC = "Backup destination root directory path";<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public static final String 
OPTION_TABLE_MAPPING = "m";<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public static final String 
OPTION_TABLE_MAPPING_DESC =<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      "A comma separated list of target 
tables. "<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          + "If specified, each table in 
&lt;tables&gt; must have a mapping";<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public static final String 
OPTION_YARN_QUEUE_NAME = "q";<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public static final String 
OPTION_YARN_QUEUE_NAME_DESC = "Yarn queue name to run backup create command 
on";<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static final String 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC = "Yarn queue name to run backup restore 
command on";<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public final static String 
JOB_NAME_CONF_KEY = "mapreduce.job.name";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public static final String 
BACKUP_CONFIG_STRING =  BackupRestoreConstants.BACKUP_ENABLE_KEY + "=true\n"<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>      + 
"hbase.master.logcleaner.plugins="<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      
+"YOUR_PLUGINS,org.apache.hadoop.hbase.backup.master.BackupLogCleaner\n"<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      + 
"hbase.procedure.master.classes=YOUR_CLASSES,"<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      
+"org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager\n"<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>      + 
"hbase.procedure.regionserver.classes=YOUR_CLASSES,"<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      + 
"org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager\n"<a
 name="line.104"></a>
-<span class="sourceLineNo">105</span>      + 
"hbase.coprocessor.region.classes=YOUR_CLASSES,"<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      + 
"org.apache.hadoop.hbase.backup.BackupObserver\n"<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      + "and restart the cluster\n";<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>  public static final String 
ENABLE_BACKUP = "Backup is not enabled. To enable backup, "+<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      "in hbase-site.xml, set:\n "<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      + BACKUP_CONFIG_STRING;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public static final String 
VERIFY_BACKUP = "Please make sure that backup is enabled on the cluster. To 
enable backup, "+<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      "in hbase-site.xml, set:\n "<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      + BACKUP_CONFIG_STRING;<a 
name="line.114"></a>
+<span class="sourceLineNo">068</span>  String OPTION_TABLE_LIST = "l";<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  String OPTION_TABLE_LIST_DESC = "Table 
name list, comma-separated.";<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  String OPTION_BANDWIDTH = "b";<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  String OPTION_BANDWIDTH_DESC = 
"Bandwidth per task (MapReduce task) in MB/s";<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  String OPTION_WORKERS = "w";<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>  String OPTION_WORKERS_DESC = "Number of 
parallel MapReduce tasks to execute";<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  String OPTION_RECORD_NUMBER = "n";<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  String OPTION_RECORD_NUMBER_DESC = 
"Number of records of backup history. Default: 10";<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  String OPTION_PATH = "p";<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>  String OPTION_PATH_DESC = "Backup 
destination root directory path";<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>  String OPTION_TABLE_MAPPING = "m";<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>  String OPTION_TABLE_MAPPING_DESC =<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      "A comma separated list of target 
tables. "<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          + "If specified, each table in 
&lt;tables&gt; must have a mapping";<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  String OPTION_YARN_QUEUE_NAME = "q";<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  String OPTION_YARN_QUEUE_NAME_DESC = 
"Yarn queue name to run backup create command on";<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  String 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC = "Yarn queue name to run backup restore 
command on";<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  String JOB_NAME_CONF_KEY = 
"mapreduce.job.name";<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  String BACKUP_CONFIG_STRING = 
BackupRestoreConstants.BACKUP_ENABLE_KEY<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          + "=true\n"<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>          + 
"hbase.master.logcleaner.plugins="<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          
+"YOUR_PLUGINS,org.apache.hadoop.hbase.backup.master.BackupLogCleaner\n"<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>          + 
"hbase.procedure.master.classes=YOUR_CLASSES,"<a name="line.97"></a>
+<span class="sourceLineNo">098</span>          
+"org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager\n"<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>          + 
"hbase.procedure.regionserver.classes=YOUR_CLASSES,"<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          + 
"org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager\n"<a
 name="line.100"></a>
+<span class="sourceLineNo">101</span>          + 
"hbase.coprocessor.region.classes=YOUR_CLASSES,"<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          + 
"org.apache.hadoop.hbase.backup.BackupObserver\n"<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          + "and restart the 
cluster\n";<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  String ENABLE_BACKUP = "Backup is not 
enabled. To enable backup, "+<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      "in hbase-site.xml, set:\n "<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>      + BACKUP_CONFIG_STRING;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  String VERIFY_BACKUP = "Please make 
sure that backup is enabled on the cluster. To enable "<a name="line.108"></a>
+<span class="sourceLineNo">109</span>          + "backup, in hbase-site.xml, 
set:\n " + BACKUP_CONFIG_STRING;<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /*<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   *  Delimiter in table name list in 
restore command<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  String TABLENAME_DELIMITER_IN_COMMAND = 
",";<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>   *  Delimiter in table name list in 
restore command<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  public static final String 
TABLENAME_DELIMITER_IN_COMMAND = ",";<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  public static final String 
CONF_STAGING_ROOT = "snapshot.export.staging.root";<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public static final String 
BACKUPID_PREFIX = "backup_";<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static enum BackupCommand {<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    CREATE, CANCEL, DELETE, DESCRIBE, 
HISTORY, STATUS, CONVERT, MERGE, STOP, SHOW, HELP, PROGRESS,<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    SET, SET_ADD, SET_REMOVE, SET_DELETE, 
SET_DESCRIBE, SET_LIST, REPAIR<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>}<a name="line.130"></a>
+<span class="sourceLineNo">116</span>  String CONF_STAGING_ROOT = 
"snapshot.export.staging.root";<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  String BACKUPID_PREFIX = "backup_";<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>  enum BackupCommand {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    CREATE, CANCEL, DELETE, DESCRIBE, 
HISTORY, STATUS, CONVERT, MERGE, STOP, SHOW, HELP, PROGRESS,<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    SET, SET_ADD, SET_REMOVE, SET_DELETE, 
SET_DESCRIBE, SET_LIST, REPAIR<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.html
index 7e1a37b..e68377f 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreConstants.html
@@ -37,105 +37,99 @@
 <span class="sourceLineNo">029</span>  /*<a name="line.29"></a>
 <span class="sourceLineNo">030</span>   * Backup/Restore constants<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>   */<a name="line.31"></a>
-<span class="sourceLineNo">032</span>  public final static String 
BACKUP_SYSTEM_TABLE_NAME_KEY = "hbase.backup.system.table.name";<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>  public final static String 
BACKUP_SYSTEM_TABLE_NAME_DEFAULT = "backup:system";<a name="line.33"></a>
+<span class="sourceLineNo">032</span>  String BACKUP_SYSTEM_TABLE_NAME_KEY = 
"hbase.backup.system.table.name";<a name="line.32"></a>
+<span class="sourceLineNo">033</span>  String BACKUP_SYSTEM_TABLE_NAME_DEFAULT 
= "backup:system";<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>  public final static String 
BACKUP_SYSTEM_TTL_KEY = "hbase.backup.system.ttl";<a name="line.35"></a>
+<span class="sourceLineNo">035</span>  String BACKUP_SYSTEM_TTL_KEY = 
"hbase.backup.system.ttl";<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>  public final static int 
BACKUP_SYSTEM_TTL_DEFAULT = HConstants.FOREVER;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public final static String 
BACKUP_ENABLE_KEY = "hbase.backup.enable";<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  public final static boolean 
BACKUP_ENABLE_DEFAULT = false;<a name="line.39"></a>
+<span class="sourceLineNo">037</span>  int BACKUP_SYSTEM_TTL_DEFAULT = 
HConstants.FOREVER;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  String BACKUP_ENABLE_KEY = 
"hbase.backup.enable";<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  boolean BACKUP_ENABLE_DEFAULT = 
false;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  public static final String 
BACKUP_MAX_ATTEMPTS_KEY = "hbase.backup.attempts.max";<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  public static final int 
DEFAULT_BACKUP_MAX_ATTEMPTS = 10;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public static final String 
BACKUP_ATTEMPTS_PAUSE_MS_KEY = "hbase.backup.attempts.pause.ms";<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  public static final int 
DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS = 10000;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  /*<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   *  Drivers option list<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>   */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final String 
OPTION_OVERWRITE = "o";<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  public static final String 
OPTION_OVERWRITE_DESC =<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      "Overwrite data if any of the 
restore target tables exists";<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public static final String OPTION_CHECK 
= "c";<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public static final String 
OPTION_CHECK_DESC =<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      "Check restore sequence and 
dependencies only (does not execute the command)";<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String OPTION_SET = 
"s";<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public static final String 
OPTION_SET_DESC = "Backup set name";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String 
OPTION_SET_RESTORE_DESC =<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      "Backup set to restore, mutually 
exclusive with -t (table list)";<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public static final String 
OPTION_SET_BACKUP_DESC =<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      "Backup set to backup, mutually 
exclusive with -t (table list)";<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static final String OPTION_DEBUG 
= "d";<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static final String 
OPTION_DEBUG_DESC = "Enable debug loggings";<a name="line.66"></a>
+<span class="sourceLineNo">041</span>  String BACKUP_MAX_ATTEMPTS_KEY = 
"hbase.backup.attempts.max";<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  int DEFAULT_BACKUP_MAX_ATTEMPTS = 10;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  String BACKUP_ATTEMPTS_PAUSE_MS_KEY = 
"hbase.backup.attempts.pause.ms";<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  int DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS = 
10000;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  /*<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   *  Drivers option list<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>   */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  String OPTION_OVERWRITE = "o";<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  String OPTION_OVERWRITE_DESC = 
"Overwrite data if any of the restore target tables exists";<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  String OPTION_CHECK = "c";<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>  String OPTION_CHECK_DESC =<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>      "Check restore sequence and 
dependencies only (does not execute the command)";<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  String OPTION_SET = "s";<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>  String OPTION_SET_DESC = "Backup set 
name";<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  String OPTION_SET_RESTORE_DESC = 
"Backup set to restore, mutually exclusive with -t (table list)";<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>  String OPTION_SET_BACKUP_DESC = "Backup 
set to backup, mutually exclusive with -t (table list)";<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  String OPTION_DEBUG = "d";<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  String OPTION_DEBUG_DESC = "Enable 
debug loggings";<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  String OPTION_TABLE = "t";<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>  String OPTION_TABLE_DESC = "Table name. 
If specified, only backup images,"<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      + " which contain this table will 
be listed.";<a name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  public static final String OPTION_TABLE 
= "t";<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public static final String 
OPTION_TABLE_DESC = "Table name. If specified, only backup images,"<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      + " which contain this table will 
be listed.";<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public static final String 
OPTION_TABLE_LIST = "l";<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static final String 
OPTION_TABLE_LIST_DESC = "Table name list, comma-separated.";<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public static final String 
OPTION_BANDWIDTH = "b";<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public static final String 
OPTION_BANDWIDTH_DESC = "Bandwidth per task (MapReduce task) in MB/s";<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public static final String 
OPTION_WORKERS = "w";<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static final String 
OPTION_WORKERS_DESC = "Number of parallel MapReduce tasks to execute";<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public static final String 
OPTION_RECORD_NUMBER = "n";<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public static final String 
OPTION_RECORD_NUMBER_DESC =<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      "Number of records of backup 
history. Default: 10";<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static final String OPTION_PATH 
= "p";<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public static final String 
OPTION_PATH_DESC = "Backup destination root directory path";<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public static final String 
OPTION_TABLE_MAPPING = "m";<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public static final String 
OPTION_TABLE_MAPPING_DESC =<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      "A comma separated list of target 
tables. "<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          + "If specified, each table in 
&lt;tables&gt; must have a mapping";<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public static final String 
OPTION_YARN_QUEUE_NAME = "q";<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public static final String 
OPTION_YARN_QUEUE_NAME_DESC = "Yarn queue name to run backup create command 
on";<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static final String 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC = "Yarn queue name to run backup restore 
command on";<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public final static String 
JOB_NAME_CONF_KEY = "mapreduce.job.name";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public static final String 
BACKUP_CONFIG_STRING =  BackupRestoreConstants.BACKUP_ENABLE_KEY + "=true\n"<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>      + 
"hbase.master.logcleaner.plugins="<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      
+"YOUR_PLUGINS,org.apache.hadoop.hbase.backup.master.BackupLogCleaner\n"<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      + 
"hbase.procedure.master.classes=YOUR_CLASSES,"<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      
+"org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager\n"<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>      + 
"hbase.procedure.regionserver.classes=YOUR_CLASSES,"<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      + 
"org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager\n"<a
 name="line.104"></a>
-<span class="sourceLineNo">105</span>      + 
"hbase.coprocessor.region.classes=YOUR_CLASSES,"<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      + 
"org.apache.hadoop.hbase.backup.BackupObserver\n"<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      + "and restart the cluster\n";<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>  public static final String 
ENABLE_BACKUP = "Backup is not enabled. To enable backup, "+<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      "in hbase-site.xml, set:\n "<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      + BACKUP_CONFIG_STRING;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public static final String 
VERIFY_BACKUP = "Please make sure that backup is enabled on the cluster. To 
enable backup, "+<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      "in hbase-site.xml, set:\n "<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      + BACKUP_CONFIG_STRING;<a 
name="line.114"></a>
+<span class="sourceLineNo">068</span>  String OPTION_TABLE_LIST = "l";<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  String OPTION_TABLE_LIST_DESC = "Table 
name list, comma-separated.";<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  String OPTION_BANDWIDTH = "b";<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  String OPTION_BANDWIDTH_DESC = 
"Bandwidth per task (MapReduce task) in MB/s";<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  String OPTION_WORKERS = "w";<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>  String OPTION_WORKERS_DESC = "Number of 
parallel MapReduce tasks to execute";<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  String OPTION_RECORD_NUMBER = "n";<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  String OPTION_RECORD_NUMBER_DESC = 
"Number of records of backup history. Default: 10";<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  String OPTION_PATH = "p";<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>  String OPTION_PATH_DESC = "Backup 
destination root directory path";<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>  String OPTION_TABLE_MAPPING = "m";<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>  String OPTION_TABLE_MAPPING_DESC =<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      "A comma separated list of target 
tables. "<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          + "If specified, each table in 
&lt;tables&gt; must have a mapping";<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  String OPTION_YARN_QUEUE_NAME = "q";<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  String OPTION_YARN_QUEUE_NAME_DESC = 
"Yarn queue name to run backup create command on";<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  String 
OPTION_YARN_QUEUE_NAME_RESTORE_DESC = "Yarn queue name to run backup restore 
command on";<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  String JOB_NAME_CONF_KEY = 
"mapreduce.job.name";<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  String BACKUP_CONFIG_STRING = 
BackupRestoreConstants.BACKUP_ENABLE_KEY<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          + "=true\n"<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>          + 
"hbase.master.logcleaner.plugins="<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          
+"YOUR_PLUGINS,org.apache.hadoop.hbase.backup.master.BackupLogCleaner\n"<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>          + 
"hbase.procedure.master.classes=YOUR_CLASSES,"<a name="line.97"></a>
+<span class="sourceLineNo">098</span>          
+"org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager\n"<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>          + 
"hbase.procedure.regionserver.classes=YOUR_CLASSES,"<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          + 
"org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager\n"<a
 name="line.100"></a>
+<span class="sourceLineNo">101</span>          + 
"hbase.coprocessor.region.classes=YOUR_CLASSES,"<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          + 
"org.apache.hadoop.hbase.backup.BackupObserver\n"<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          + "and restart the 
cluster\n";<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  String ENABLE_BACKUP = "Backup is not 
enabled. To enable backup, "+<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      "in hbase-site.xml, set:\n "<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>      + BACKUP_CONFIG_STRING;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  String VERIFY_BACKUP = "Please make 
sure that backup is enabled on the cluster. To enable "<a name="line.108"></a>
+<span class="sourceLineNo">109</span>          + "backup, in hbase-site.xml, 
set:\n " + BACKUP_CONFIG_STRING;<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /*<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   *  Delimiter in table name list in 
restore command<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  String TABLENAME_DELIMITER_IN_COMMAND = 
",";<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>   *  Delimiter in table name list in 
restore command<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  public static final String 
TABLENAME_DELIMITER_IN_COMMAND = ",";<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  public static final String 
CONF_STAGING_ROOT = "snapshot.export.staging.root";<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public static final String 
BACKUPID_PREFIX = "backup_";<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static enum BackupCommand {<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    CREATE, CANCEL, DELETE, DESCRIBE, 
HISTORY, STATUS, CONVERT, MERGE, STOP, SHOW, HELP, PROGRESS,<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    SET, SET_ADD, SET_REMOVE, SET_DELETE, 
SET_DESCRIBE, SET_LIST, REPAIR<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>}<a name="line.130"></a>
+<span class="sourceLineNo">116</span>  String CONF_STAGING_ROOT = 
"snapshot.export.staging.root";<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  String BACKUPID_PREFIX = "backup_";<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>  enum BackupCommand {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    CREATE, CANCEL, DELETE, DESCRIBE, 
HISTORY, STATUS, CONVERT, MERGE, STOP, SHOW, HELP, PROGRESS,<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    SET, SET_ADD, SET_REMOVE, SET_DELETE, 
SET_DESCRIBE, SET_LIST, REPAIR<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreFactory.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreFactory.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreFactory.html
index cc1b361..e32c2f6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreFactory.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupRestoreFactory.html
@@ -29,8 +29,8 @@
 <span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupCopyJob;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupMergeJob;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.backup.mapreduce.MapReduceRestoreJob;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.util.ReflectionUtils;<a name="line.25"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.util.ReflectionUtils;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a>
 <span class="sourceLineNo">026</span><a name="line.26"></a>
 <span class="sourceLineNo">027</span>/**<a name="line.27"></a>
 <span class="sourceLineNo">028</span> * Factory implementation for 
backup/restore related jobs<a name="line.28"></a>
@@ -38,56 +38,55 @@
 <span class="sourceLineNo">030</span> */<a name="line.30"></a>
 <span class="sourceLineNo">031</span>@InterfaceAudience.Private<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>public final class BackupRestoreFactory 
{<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>  public final static String 
HBASE_INCR_RESTORE_IMPL_CLASS = "hbase.incremental.restore.class";<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>  public final static String 
HBASE_BACKUP_COPY_IMPL_CLASS = "hbase.backup.copy.class";<a name="line.35"></a>
-<span class="sourceLineNo">036</span>  public final static String 
HBASE_BACKUP_MERGE_IMPL_CLASS = "hbase.backup.merge.class";<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>  private BackupRestoreFactory() {<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>    throw new 
AssertionError("Instantiating utility class...");<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  }<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  /**<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   * Gets backup restore job<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>   * @param conf configuration<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>   * @return backup restore job 
instance<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  public static RestoreJob 
getRestoreJob(Configuration conf) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    Class&lt;? extends RestoreJob&gt; cls 
=<a name="line.48"></a>
-<span class="sourceLineNo">049</span>        
conf.getClass(HBASE_INCR_RESTORE_IMPL_CLASS, MapReduceRestoreJob.class, 
RestoreJob.class);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    RestoreJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    service.setConf(conf);<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>    return service;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Gets backup copy job<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>   * @param conf configuration<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>   * @return backup copy job instance<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>   */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public static BackupCopyJob 
getBackupCopyJob(Configuration conf) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    Class&lt;? extends BackupCopyJob&gt; 
cls =<a name="line.61"></a>
-<span class="sourceLineNo">062</span>        
conf.getClass(HBASE_BACKUP_COPY_IMPL_CLASS, MapReduceBackupCopyJob.class,<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>          BackupCopyJob.class);<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    BackupCopyJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    service.setConf(conf);<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    return service;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * Gets backup merge job<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>   * @param conf configuration<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>   * @return backup merge job instance<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public static BackupMergeJob 
getBackupMergeJob(Configuration conf) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    Class&lt;? extends BackupMergeJob&gt; 
cls =<a name="line.75"></a>
-<span class="sourceLineNo">076</span>        
conf.getClass(HBASE_BACKUP_MERGE_IMPL_CLASS, MapReduceBackupMergeJob.class,<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>          BackupMergeJob.class);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    BackupMergeJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    service.setConf(conf);<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>    return service;<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">033</span>  public final static String 
HBASE_INCR_RESTORE_IMPL_CLASS = "hbase.incremental.restore.class";<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>  public final static String 
HBASE_BACKUP_COPY_IMPL_CLASS = "hbase.backup.copy.class";<a name="line.34"></a>
+<span class="sourceLineNo">035</span>  public final static String 
HBASE_BACKUP_MERGE_IMPL_CLASS = "hbase.backup.merge.class";<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>  private BackupRestoreFactory() {<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>    throw new 
AssertionError("Instantiating utility class...");<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  }<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>  /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   * Gets backup restore job<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>   * @param conf configuration<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>   * @return backup restore job 
instance<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public static RestoreJob 
getRestoreJob(Configuration conf) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    Class&lt;? extends RestoreJob&gt; cls 
=<a name="line.47"></a>
+<span class="sourceLineNo">048</span>        
conf.getClass(HBASE_INCR_RESTORE_IMPL_CLASS, MapReduceRestoreJob.class, 
RestoreJob.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    RestoreJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    service.setConf(conf);<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    return service;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  /**<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * Gets backup copy job<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>   * @param conf configuration<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>   * @return backup copy job instance<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public static BackupCopyJob 
getBackupCopyJob(Configuration conf) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    Class&lt;? extends BackupCopyJob&gt; 
cls =<a name="line.60"></a>
+<span class="sourceLineNo">061</span>        
conf.getClass(HBASE_BACKUP_COPY_IMPL_CLASS, MapReduceBackupCopyJob.class,<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>          BackupCopyJob.class);<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    BackupCopyJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    service.setConf(conf);<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    return service;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * Gets backup merge job<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>   * @param conf configuration<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>   * @return backup merge job instance<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>   */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public static BackupMergeJob 
getBackupMergeJob(Configuration conf) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    Class&lt;? extends BackupMergeJob&gt; 
cls =<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        
conf.getClass(HBASE_BACKUP_MERGE_IMPL_CLASS, MapReduceBackupMergeJob.class,<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>          BackupMergeJob.class);<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    BackupMergeJob service = 
ReflectionUtils.newInstance(cls, conf);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    service.setConf(conf);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    return service;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span>}<a name="line.81"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupTableInfo.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupTableInfo.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupTableInfo.html
index 2bd4659..0b7408a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupTableInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/BackupTableInfo.html
@@ -38,56 +38,53 @@
 <span class="sourceLineNo">030</span><a name="line.30"></a>
 <span class="sourceLineNo">031</span>@InterfaceAudience.Private<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>public class BackupTableInfo  {<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>  /*<a name="line.34"></a>
-<span class="sourceLineNo">035</span>   *  Table name for backup<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>   */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  private TableName table;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>  /*<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   *  Snapshot name for offline/online 
snapshot<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   */<a name="line.41"></a>
+<span class="sourceLineNo">033</span>  /*<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   *  Table name for backup<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>   */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>  private TableName table;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>  /*<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   *  Snapshot name for offline/online 
snapshot<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   */<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  private String snapshotName = null;<a 
name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  private String snapshotName = null;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public BackupTableInfo() {<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public BackupTableInfo(TableName table, 
String targetRootDir, String backupId) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    this.table = table;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  public String getSnapshotName() {<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    return snapshotName;<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>  public void setSnapshotName(String 
snapshotName) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    this.snapshotName = snapshotName;<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>  public TableName getTable() {<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    return table;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static BackupTableInfo 
convert(BackupProtos.BackupTableInfo proto) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    BackupTableInfo bs = new 
BackupTableInfo();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    bs.table = 
ProtobufUtil.toTableName(proto.getTableName());<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    if (proto.hasSnapshotName()) {<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>      bs.snapshotName = 
proto.getSnapshotName();<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    }<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    return bs;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public BackupProtos.BackupTableInfo 
toProto() {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    BackupProtos.BackupTableInfo.Builder 
builder = BackupProtos.BackupTableInfo.newBuilder();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    if (snapshotName != null) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>      
builder.setSnapshotName(snapshotName);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    
builder.setTableName(org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil.toProtoTableName(table));<a
 name="line.79"></a>
-<span class="sourceLineNo">080</span>    return builder.build();<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">043</span>  public BackupTableInfo() {<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>  }<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public BackupTableInfo(TableName table, 
String targetRootDir, String backupId) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    this.table = table;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public String getSnapshotName() {<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    return snapshotName;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  public void setSnapshotName(String 
snapshotName) {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    this.snapshotName = snapshotName;<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>  public TableName getTable() {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>    return table;<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>  public static BackupTableInfo 
convert(BackupProtos.BackupTableInfo proto) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    BackupTableInfo bs = new 
BackupTableInfo();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    bs.table = 
ProtobufUtil.toTableName(proto.getTableName());<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    if (proto.hasSnapshotName()) {<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>      bs.snapshotName = 
proto.getSnapshotName();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return bs;<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>  public BackupProtos.BackupTableInfo 
toProto() {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    BackupProtos.BackupTableInfo.Builder 
builder = BackupProtos.BackupTableInfo.newBuilder();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    if (snapshotName != null) {<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>      
builder.setSnapshotName(snapshotName);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    }<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    
builder.setTableName(ProtobufUtil.toProtoTableName(table));<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    return builder.build();<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>}<a name="line.79"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/HBackupFileSystem.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HBackupFileSystem.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HBackupFileSystem.html
index 265fbf7..d7c91d0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HBackupFileSystem.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HBackupFileSystem.html
@@ -45,7 +45,7 @@
 <span class="sourceLineNo">037</span> * the on-disk Backup Image data.<a 
name="line.37"></a>
 <span class="sourceLineNo">038</span> */<a name="line.38"></a>
 <span class="sourceLineNo">039</span>@InterfaceAudience.Private<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>public class HBackupFileSystem {<a 
name="line.40"></a>
+<span class="sourceLineNo">040</span>public final class HBackupFileSystem {<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span>  public static final Logger LOG = 
LoggerFactory.getLogger(HBackupFileSystem.class);<a name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>
 <span class="sourceLineNo">043</span>  /**<a name="line.43"></a>
@@ -114,44 +114,42 @@
 <span class="sourceLineNo">106</span>  // Move manifest file to other place<a 
name="line.106"></a>
 <span class="sourceLineNo">107</span>  private static Path 
getManifestPath(Configuration conf, Path backupRootPath, String backupId)<a 
name="line.107"></a>
 <span class="sourceLineNo">108</span>      throws IOException {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    Path manifestPath = null;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>    FileSystem fs = 
backupRootPath.getFileSystem(conf);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    manifestPath =<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        new 
Path(getBackupPath(backupRootPath.toString(), backupId) + Path.SEPARATOR<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>            + 
BackupManifest.MANIFEST_FILE_NAME);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (!fs.exists(manifestPath)) {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      String errorMsg =<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>          "Could not find backup manifest 
" + BackupManifest.MANIFEST_FILE_NAME + " for "<a name="line.117"></a>
-<span class="sourceLineNo">118</span>              + backupId + ". File " + 
manifestPath + " does not exists. Did " + backupId<a name="line.118"></a>
-<span class="sourceLineNo">119</span>              + " correspond to 
previously taken backup ?";<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      throw new IOException(errorMsg);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    return manifestPath;<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>  public static BackupManifest<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>      getManifest(Configuration conf, 
Path backupRootPath, String backupId) throws IOException {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    BackupManifest manifest =<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>        new BackupManifest(conf, 
getManifestPath(conf, backupRootPath, backupId));<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return manifest;<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>  /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * Check whether the backup image path 
and there is manifest file in the path.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * @param backupManifestMap If all the 
manifests are found, then they are put into this map<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * @param tableArray the tables 
involved<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   * @throws IOException exception<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public static void 
checkImageManifestExist(HashMap&lt;TableName, BackupManifest&gt; 
backupManifestMap,<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      TableName[] tableArray, 
Configuration conf, Path backupRootPath, String backupId)<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      throws IOException {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    for (TableName tableName : 
tableArray) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      BackupManifest manifest = 
getManifest(conf, backupRootPath, backupId);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      backupManifestMap.put(tableName, 
manifest);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>}<a name="line.146"></a>
+<span class="sourceLineNo">109</span>    FileSystem fs = 
backupRootPath.getFileSystem(conf);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    Path manifestPath =<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>        new 
Path(getBackupPath(backupRootPath.toString(), backupId) + Path.SEPARATOR<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>            + 
BackupManifest.MANIFEST_FILE_NAME);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    if (!fs.exists(manifestPath)) {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>      String errorMsg =<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>          "Could not find backup manifest 
" + BackupManifest.MANIFEST_FILE_NAME + " for "<a name="line.115"></a>
+<span class="sourceLineNo">116</span>              + backupId + ". File " + 
manifestPath + " does not exists. Did " + backupId<a name="line.116"></a>
+<span class="sourceLineNo">117</span>              + " correspond to 
previously taken backup ?";<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      throw new IOException(errorMsg);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    return manifestPath;<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>  public static BackupManifest<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>      getManifest(Configuration conf, 
Path backupRootPath, String backupId) throws IOException {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    BackupManifest manifest =<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>        new BackupManifest(conf, 
getManifestPath(conf, backupRootPath, backupId));<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return manifest;<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>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * Check whether the backup image path 
and there is manifest file in the path.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @param backupManifestMap If all the 
manifests are found, then they are put into this map<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @param tableArray the tables 
involved<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   * @throws IOException exception<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>   */<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  public static void 
checkImageManifestExist(HashMap&lt;TableName, BackupManifest&gt; 
backupManifestMap,<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      TableName[] tableArray, 
Configuration conf, Path backupRootPath, String backupId)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      throws IOException {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    for (TableName tableName : 
tableArray) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      BackupManifest manifest = 
getManifest(conf, backupRootPath, backupId);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      backupManifestMap.put(tableName, 
manifest);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>}<a name="line.144"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/LogUtils.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/LogUtils.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/LogUtils.html
index a74076a..808784c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/LogUtils.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/LogUtils.html
@@ -25,10 +25,10 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.backup;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.log4j.Level;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.log4j.LogManager;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.log4j.Logger;<a 
name="line.23"></a>
+<span class="sourceLineNo">020</span>import org.apache.log4j.Level;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.log4j.LogManager;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.log4j.Logger;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>/**<a name="line.25"></a>
 <span class="sourceLineNo">026</span> * Utility class for disabling Zk and 
client logging<a name="line.26"></a>
@@ -36,25 +36,24 @@
 <span class="sourceLineNo">028</span> */<a name="line.28"></a>
 <span class="sourceLineNo">029</span>@InterfaceAudience.Private<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>final class LogUtils {<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>  private LogUtils() {<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>  }<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>  /**<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   * Disables Zk- and HBase client 
logging<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  static void disableZkAndClientLoggers() 
{<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    // disable zookeeper log to avoid it 
mess up command output<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    Logger zkLogger = 
LogManager.getLogger("org.apache.zookeeper");<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    zkLogger.setLevel(Level.OFF);<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>    // disable hbase zookeeper tool log 
to avoid it mess up command output<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    Logger hbaseZkLogger = 
LogManager.getLogger("org.apache.hadoop.hbase.zookeeper");<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    hbaseZkLogger.setLevel(Level.OFF);<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>    // disable hbase client log to avoid 
it mess up command output<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    Logger hbaseClientLogger = 
LogManager.getLogger("org.apache.hadoop.hbase.client");<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    
hbaseClientLogger.setLevel(Level.OFF);<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
-<span class="sourceLineNo">049</span>}<a name="line.49"></a>
+<span class="sourceLineNo">031</span>  private LogUtils() {<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>  }<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>  /**<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   * Disables Zk- and HBase client 
logging<a name="line.35"></a>
+<span class="sourceLineNo">036</span>   */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>  static void disableZkAndClientLoggers() 
{<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    // disable zookeeper log to avoid it 
mess up command output<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    Logger zkLogger = 
LogManager.getLogger("org.apache.zookeeper");<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    zkLogger.setLevel(Level.OFF);<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>    // disable hbase zookeeper tool log 
to avoid it mess up command output<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    Logger hbaseZkLogger = 
LogManager.getLogger("org.apache.hadoop.hbase.zookeeper");<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    hbaseZkLogger.setLevel(Level.OFF);<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>    // disable hbase client log to avoid 
it mess up command output<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    Logger hbaseClientLogger = 
LogManager.getLogger("org.apache.hadoop.hbase.client");<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    
hbaseClientLogger.setLevel(Level.OFF);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
+<span class="sourceLineNo">048</span>}<a name="line.48"></a>
 
 
 

Reply via email to