http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.html
index ef6faa1..dae573d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/LogRollMasterProcedureManager.html
@@ -32,26 +32,26 @@
 <span class="sourceLineNo">024</span>import 
java.util.concurrent.ThreadPoolExecutor;<a name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.coordination.ZkCoordinatedStateManager;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.master.MasterServices;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.master.MetricsMaster;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.procedure.MasterProcedureManager;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.procedure.Procedure;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.procedure.ProcedureCoordinator;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.procedure.ProcedureCoordinatorRpcs;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.procedure.RegionServerProcedureManager;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameStringPair;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription;<a
 name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.zookeeper.KeeperException;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a 
name="line.46"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.coordination.ZkCoordinatedStateManager;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.master.MasterServices;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.master.MetricsMaster;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.procedure.MasterProcedureManager;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.procedure.Procedure;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.procedure.ProcedureCoordinator;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.procedure.ProcedureCoordinatorRpcs;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.procedure.RegionServerProcedureManager;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameStringPair;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription;<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> * Master procedure manager for 
coordinated cluster-wide WAL roll operation, which is run during<a 
name="line.49"></a>
@@ -65,114 +65,114 @@
 <span class="sourceLineNo">057</span>  public static final String 
ROLLLOG_PROCEDURE_NAME = "rolllog";<a name="line.57"></a>
 <span class="sourceLineNo">058</span>  public static final String 
BACKUP_WAKE_MILLIS_KEY = "hbase.backup.logroll.wake.millis";<a 
name="line.58"></a>
 <span class="sourceLineNo">059</span>  public static final String 
BACKUP_TIMEOUT_MILLIS_KEY = "hbase.backup.logroll.timeout.millis";<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  public static final String 
BACKUP_POOL_THREAD_NUMBER_KEY = "hbase.backup.logroll.pool.thread.number";<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public static final int 
BACKUP_WAKE_MILLIS_DEFAULT = 500;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public static final int 
BACKUP_TIMEOUT_MILLIS_DEFAULT = 180000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final int 
BACKUP_POOL_THREAD_NUMBER_DEFAULT = 8;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private MasterServices master;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>  private ProcedureCoordinator 
coordinator;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private boolean done;<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public void stop(String why) {<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    LOG.info("stop: " + why);<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>  @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public boolean isStopped() {<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    return false;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public void initialize(MasterServices 
master, MetricsMaster metricsMaster)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      throws KeeperException, 
IOException, UnsupportedOperationException {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    this.master = master;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    this.done = false;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>    // setup the default procedure 
coordinator<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    String name = 
master.getServerName().toString();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">060</span>  public static final String 
BACKUP_POOL_THREAD_NUMBER_KEY =<a name="line.60"></a>
+<span class="sourceLineNo">061</span>          
"hbase.backup.logroll.pool.thread.number";<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  public static final int 
BACKUP_WAKE_MILLIS_DEFAULT = 500;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public static final int 
BACKUP_TIMEOUT_MILLIS_DEFAULT = 180000;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public static final int 
BACKUP_POOL_THREAD_NUMBER_DEFAULT = 8;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  private MasterServices master;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>  private ProcedureCoordinator 
coordinator;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  private boolean done;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public void stop(String why) {<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    LOG.info("stop: " + why);<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public boolean isStopped() {<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    return false;<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>
+<span class="sourceLineNo">080</span>  @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public void initialize(MasterServices 
master, MetricsMaster metricsMaster)<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      throws IOException, 
UnsupportedOperationException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    this.master = master;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>    this.done = false;<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>    // setup the default procedure 
coordinator<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    String name = 
master.getServerName().toString();<a name="line.87"></a>
 <span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    // get the configuration for the 
coordinator<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    Configuration conf = 
master.getConfiguration();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    long wakeFrequency = 
conf.getInt(BACKUP_WAKE_MILLIS_KEY, BACKUP_WAKE_MILLIS_DEFAULT);<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    long timeoutMillis = 
conf.getLong(BACKUP_TIMEOUT_MILLIS_KEY,BACKUP_TIMEOUT_MILLIS_DEFAULT);<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    int opThreads = 
conf.getInt(BACKUP_POOL_THREAD_NUMBER_KEY,<a name="line.93"></a>
-<span class="sourceLineNo">094</span>                                    
BACKUP_POOL_THREAD_NUMBER_DEFAULT);<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    // setup the default procedure 
coordinator<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    ThreadPoolExecutor tpool = 
ProcedureCoordinator.defaultPool(name, opThreads);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    CoordinatedStateManager coordManager 
= new ZkCoordinatedStateManager(master);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    ProcedureCoordinatorRpcs comms =<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>        
coordManager.getProcedureCoordinatorRpcs(getProcedureSignature(), name);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    this.coordinator = new 
ProcedureCoordinator(comms, tpool, timeoutMillis, wakeFrequency);<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public String getProcedureSignature() 
{<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    return ROLLLOG_PROCEDURE_SIGNATURE;<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>  @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  public void 
execProcedure(ProcedureDescription desc) throws IOException {<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    if (!isBackupEnabled()) {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      LOG.warn("Backup is not enabled. 
Check your " + BackupRestoreConstants.BACKUP_ENABLE_KEY<a name="line.113"></a>
-<span class="sourceLineNo">114</span>          + " setting");<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      return;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    this.done = false;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    // start the process on the RS<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    ForeignExceptionDispatcher monitor = 
new ForeignExceptionDispatcher(desc.getInstance());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    List&lt;ServerName&gt; serverNames = 
master.getServerManager().getOnlineServersList();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    List&lt;String&gt; servers = new 
ArrayList&lt;String&gt;();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    for (ServerName sn : serverNames) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>      servers.add(sn.toString());<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    List&lt;NameStringPair&gt; conf = 
desc.getConfigurationList();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    byte[] data = new byte[0];<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    if (conf.size() &gt; 0) {<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      // Get backup root path<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      data = 
conf.get(0).getValue().getBytes();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    Procedure proc = 
coordinator.startProcedure(monitor, desc.getInstance(), data, servers);<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    if (proc == null) {<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      String msg = "Failed to submit 
distributed procedure for '" + desc.getInstance() + "'";<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      LOG.error(msg);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      throw new IOException(msg);<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    try {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      // wait for the procedure to 
complete. A timer thread is kicked off that should cancel this<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>      // if it takes too long.<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>      proc.waitForCompleted();<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      LOG.info("Done waiting - exec 
procedure for " + desc.getInstance());<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      LOG.info("Distributed roll log 
procedure is successful!");<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      this.done = true;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    } catch (InterruptedException e) {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      ForeignException ee =<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>          new 
ForeignException("Interrupted while waiting for roll log procdure to finish", 
e);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      monitor.receive(ee);<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      
Thread.currentThread().interrupt();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    } catch (ForeignException e) {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      ForeignException ee =<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>          new ForeignException("Exception 
while waiting for roll log procdure to finish", e);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      monitor.receive(ee);<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    monitor.rethrowException();<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  private boolean isBackupEnabled() {<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    return 
BackupManager.isBackupEnabled(master.getConfiguration());<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>  public boolean 
isProcedureDone(ProcedureDescription desc) throws IOException {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    return done;<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">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    // get the configuration for the 
coordinator<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    Configuration conf = 
master.getConfiguration();<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    long wakeFrequency = 
conf.getInt(BACKUP_WAKE_MILLIS_KEY, BACKUP_WAKE_MILLIS_DEFAULT);<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    long timeoutMillis = 
conf.getLong(BACKUP_TIMEOUT_MILLIS_KEY,BACKUP_TIMEOUT_MILLIS_DEFAULT);<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    int opThreads = 
conf.getInt(BACKUP_POOL_THREAD_NUMBER_KEY,<a name="line.94"></a>
+<span class="sourceLineNo">095</span>                                    
BACKUP_POOL_THREAD_NUMBER_DEFAULT);<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    // setup the default procedure 
coordinator<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    ThreadPoolExecutor tpool = 
ProcedureCoordinator.defaultPool(name, opThreads);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    CoordinatedStateManager coordManager 
= new ZkCoordinatedStateManager(master);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    ProcedureCoordinatorRpcs comms =<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        
coordManager.getProcedureCoordinatorRpcs(getProcedureSignature(), name);<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>    this.coordinator = new 
ProcedureCoordinator(comms, tpool, timeoutMillis, wakeFrequency);<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  @Override<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  public String getProcedureSignature() 
{<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    return ROLLLOG_PROCEDURE_SIGNATURE;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  @Override<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public void 
execProcedure(ProcedureDescription desc) throws IOException {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    if (!isBackupEnabled()) {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>      LOG.warn("Backup is not enabled. 
Check your " + BackupRestoreConstants.BACKUP_ENABLE_KEY<a name="line.114"></a>
+<span class="sourceLineNo">115</span>          + " setting");<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>      return;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    this.done = false;<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    // start the process on the RS<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    ForeignExceptionDispatcher monitor = 
new ForeignExceptionDispatcher(desc.getInstance());<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    List&lt;ServerName&gt; serverNames = 
master.getServerManager().getOnlineServersList();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    List&lt;String&gt; servers = new 
ArrayList&lt;&gt;();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    for (ServerName sn : serverNames) {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>      servers.add(sn.toString());<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    List&lt;NameStringPair&gt; conf = 
desc.getConfigurationList();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    byte[] data = new byte[0];<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    if (conf.size() &gt; 0) {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>      // Get backup root path<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>      data = 
conf.get(0).getValue().getBytes();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    Procedure proc = 
coordinator.startProcedure(monitor, desc.getInstance(), data, servers);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    if (proc == null) {<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      String msg = "Failed to submit 
distributed procedure for '" + desc.getInstance() + "'";<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      LOG.error(msg);<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      throw new IOException(msg);<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    try {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      // wait for the procedure to 
complete. A timer thread is kicked off that should cancel this<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      // if it takes too long.<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>      proc.waitForCompleted();<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      LOG.info("Done waiting - exec 
procedure for " + desc.getInstance());<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      LOG.info("Distributed roll log 
procedure is successful!");<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.done = true;<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    } catch (InterruptedException e) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>      ForeignException ee =<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>          new 
ForeignException("Interrupted while waiting for roll log procdure to finish", 
e);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      monitor.receive(ee);<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      
Thread.currentThread().interrupt();<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    } catch (ForeignException e) {<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>      ForeignException ee =<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>          new ForeignException("Exception 
while waiting for roll log procdure to finish", e);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      monitor.receive(ee);<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    monitor.rethrowException();<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  private boolean isBackupEnabled() {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    return 
BackupManager.isBackupEnabled(master.getConfiguration());<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public boolean 
isProcedureDone(ProcedureDescription desc) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    return done;<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>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html
index 9c0f674..b93f268 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html
@@ -60,119 +60,120 @@
 <span class="sourceLineNo">052</span>  public 
LogRollBackupSubprocedure(RegionServerServices rss, ProcedureMember member,<a 
name="line.52"></a>
 <span class="sourceLineNo">053</span>      ForeignExceptionDispatcher 
errorListener, long wakeFrequency, long timeout,<a name="line.53"></a>
 <span class="sourceLineNo">054</span>      LogRollBackupSubprocedurePool 
taskManager, byte[] data) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>    super(member, 
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, errorListener,<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>        wakeFrequency, timeout);<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>    LOG.info("Constructing a 
LogRollBackupSubprocedure.");<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    this.rss = rss;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    this.taskManager = taskManager;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    if (data != null) {<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>      backupRoot = new String(data);<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><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * Callable task. TODO. We don't need a 
thread pool to execute roll log. This can be simplified<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * with no use of sub-procedure pool.<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  class RSRollLogTask implements 
Callable&lt;Void&gt; {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    RSRollLogTask() {<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>    @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    public Void call() throws Exception 
{<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      if (LOG.isDebugEnabled()) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>        LOG.debug("DRPC started: " + 
rss.getServerName());<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>
-<span class="sourceLineNo">080</span>      AbstractFSWAL&lt;?&gt; fsWAL = 
(AbstractFSWAL&lt;?&gt;) rss.getWAL(null);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      long filenum = 
fsWAL.getFilenum();<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      List&lt;WAL&gt; wals = 
rss.getWALs();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      long highest = -1;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      for (WAL wal : wals) {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>        if (wal == null) continue;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>        if (((AbstractFSWAL&lt;?&gt;) 
wal).getFilenum() &gt; highest) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          highest = 
((AbstractFSWAL&lt;?&gt;) wal).getFilenum();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>      LOG.info("Trying to roll log in 
backup subprocedure, current log number: " + filenum<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          + " highest: " + highest + " on 
" + rss.getServerName());<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      ((HRegionServer) 
rss).getWalRoller().requestRollAll();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      long start = 
EnvironmentEdgeManager.currentTime();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      while (!((HRegionServer) 
rss).getWalRoller().walRollFinished()) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        Thread.sleep(20);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      LOG.debug("log roll took " + 
(EnvironmentEdgeManager.currentTime() - start));<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      LOG.info("After roll log in backup 
subprocedure, current log number: " + fsWAL.getFilenum()<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          + " on " + 
rss.getServerName());<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>      Connection connection = 
rss.getConnection();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      try (final BackupSystemTable table 
= new BackupSystemTable(connection)) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        // sanity check, good for 
testing<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        HashMap&lt;String, Long&gt; 
serverTimestampMap =<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            
table.readRegionServerLastLogRollResult(backupRoot);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        String host = 
rss.getServerName().getHostname();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        int port = 
rss.getServerName().getPort();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        String server = host + ":" + 
port;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        Long sts = 
serverTimestampMap.get(host);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        if (sts != null &amp;&amp; sts 
&gt; highest) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>          LOG.warn("Won't update server's 
last roll log result: current=" + sts + " new=" + highest);<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>          return null;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>        }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        // write the log number to backup 
system table.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        
table.writeRegionServerLastLogRollResult(server, highest, backupRoot);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>        return null;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      } catch (Exception e) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        LOG.error(e.toString(), e);<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        throw e;<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>  }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  private void rolllog() throws 
ForeignException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    monitor.rethrowException();<a 
name="line.126"></a>
+<span class="sourceLineNo">055</span>    super(member, 
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, errorListener,<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>        wakeFrequency, timeout);<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    LOG.info("Constructing a 
LogRollBackupSubprocedure.");<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    this.rss = rss;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    this.taskManager = taskManager;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    if (data != null) {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>      backupRoot = new String(data);<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><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Callable task. TODO. We don't need a 
thread pool to execute roll log. This can be simplified<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * with no use of sub-procedure pool.<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  class RSRollLogTask implements 
Callable&lt;Void&gt; {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    RSRollLogTask() {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>    @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    public Void call() throws Exception 
{<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      if (LOG.isDebugEnabled()) {<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>        LOG.debug("DRPC started: " + 
rss.getServerName());<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>      AbstractFSWAL&lt;?&gt; fsWAL = 
(AbstractFSWAL&lt;?&gt;) rss.getWAL(null);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      long filenum = 
fsWAL.getFilenum();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      List&lt;WAL&gt; wals = 
rss.getWALs();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      long highest = -1;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>      for (WAL wal : wals) {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>        if (wal == null) {<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>          continue;<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>        if (((AbstractFSWAL&lt;?&gt;) 
wal).getFilenum() &gt; highest) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>          highest = 
((AbstractFSWAL&lt;?&gt;) wal).getFilenum();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>        }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>      LOG.info("Trying to roll log in 
backup subprocedure, current log number: " + filenum<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          + " highest: " + highest + " on 
" + rss.getServerName());<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      ((HRegionServer) 
rss).getWalRoller().requestRollAll();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      long start = 
EnvironmentEdgeManager.currentTime();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      while (!((HRegionServer) 
rss).getWalRoller().walRollFinished()) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        Thread.sleep(20);<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      LOG.debug("log roll took " + 
(EnvironmentEdgeManager.currentTime() - start));<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      LOG.info("After roll log in backup 
subprocedure, current log number: " + fsWAL.getFilenum()<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          + " on " + 
rss.getServerName());<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>      Connection connection = 
rss.getConnection();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      try (final BackupSystemTable table 
= new BackupSystemTable(connection)) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        // sanity check, good for 
testing<a name="line.106"></a>
+<span class="sourceLineNo">107</span>        HashMap&lt;String, Long&gt; 
serverTimestampMap =<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            
table.readRegionServerLastLogRollResult(backupRoot);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        String host = 
rss.getServerName().getHostname();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        int port = 
rss.getServerName().getPort();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>        String server = host + ":" + 
port;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        Long sts = 
serverTimestampMap.get(host);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        if (sts != null &amp;&amp; sts 
&gt; highest) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>          LOG.warn("Won't update server's 
last roll log result: current=" + sts + " new="<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                  + highest);<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>          return null;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        // write the log number to backup 
system table.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        
table.writeRegionServerLastLogRollResult(server, highest, backupRoot);<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>        return null;<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      } catch (Exception e) {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>        LOG.error(e.toString(), e);<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>        throw e;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    taskManager.submitTask(new 
RSRollLogTask());<a name="line.128"></a>
+<span class="sourceLineNo">128</span>  private void rolllog() throws 
ForeignException {<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    monitor.rethrowException();<a 
name="line.129"></a>
 <span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    // wait for everything to complete.<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    
taskManager.waitForOutstandingTasks();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    monitor.rethrowException();<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><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public void acquireBarrier() throws 
ForeignException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    // do nothing, executing in inside 
barrier step.<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>  /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * do a log roll.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @return some bytes<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public byte[] insideBarrier() throws 
ForeignException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    rolllog();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    return null;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * Cancel threads if they haven't 
finished.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public void cleanup(Exception e) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    taskManager.abort("Aborting log roll 
subprocedure tasks for backup due to error", e);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<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>   * Hooray!<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  public void releaseBarrier() {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    // NO OP<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>}<a name="line.167"></a>
+<span class="sourceLineNo">131</span>    taskManager.submitTask(new 
RSRollLogTask());<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    monitor.rethrowException();<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>    // wait for everything to complete.<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    
taskManager.waitForOutstandingTasks();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    monitor.rethrowException();<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public void acquireBarrier() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    // do nothing, executing in inside 
barrier step.<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>
+<span class="sourceLineNo">145</span>   * do a log roll.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @return some bytes<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>  public byte[] insideBarrier() throws 
ForeignException {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    rolllog();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    return null;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  /**<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Cancel threads if they haven't 
finished.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public void cleanup(Exception e) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    taskManager.abort("Aborting log roll 
subprocedure tasks for backup due to error", e);<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>   * Hooray!<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public void releaseBarrier() {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    // NO OP<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.html
index 9c0f674..b93f268 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.html
@@ -60,119 +60,120 @@
 <span class="sourceLineNo">052</span>  public 
LogRollBackupSubprocedure(RegionServerServices rss, ProcedureMember member,<a 
name="line.52"></a>
 <span class="sourceLineNo">053</span>      ForeignExceptionDispatcher 
errorListener, long wakeFrequency, long timeout,<a name="line.53"></a>
 <span class="sourceLineNo">054</span>      LogRollBackupSubprocedurePool 
taskManager, byte[] data) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>    super(member, 
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, errorListener,<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>        wakeFrequency, timeout);<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>    LOG.info("Constructing a 
LogRollBackupSubprocedure.");<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    this.rss = rss;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    this.taskManager = taskManager;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    if (data != null) {<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>      backupRoot = new String(data);<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><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * Callable task. TODO. We don't need a 
thread pool to execute roll log. This can be simplified<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * with no use of sub-procedure pool.<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  class RSRollLogTask implements 
Callable&lt;Void&gt; {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    RSRollLogTask() {<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>    @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    public Void call() throws Exception 
{<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      if (LOG.isDebugEnabled()) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>        LOG.debug("DRPC started: " + 
rss.getServerName());<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>
-<span class="sourceLineNo">080</span>      AbstractFSWAL&lt;?&gt; fsWAL = 
(AbstractFSWAL&lt;?&gt;) rss.getWAL(null);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      long filenum = 
fsWAL.getFilenum();<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      List&lt;WAL&gt; wals = 
rss.getWALs();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      long highest = -1;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      for (WAL wal : wals) {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>        if (wal == null) continue;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>        if (((AbstractFSWAL&lt;?&gt;) 
wal).getFilenum() &gt; highest) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          highest = 
((AbstractFSWAL&lt;?&gt;) wal).getFilenum();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>      LOG.info("Trying to roll log in 
backup subprocedure, current log number: " + filenum<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          + " highest: " + highest + " on 
" + rss.getServerName());<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      ((HRegionServer) 
rss).getWalRoller().requestRollAll();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      long start = 
EnvironmentEdgeManager.currentTime();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      while (!((HRegionServer) 
rss).getWalRoller().walRollFinished()) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        Thread.sleep(20);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      LOG.debug("log roll took " + 
(EnvironmentEdgeManager.currentTime() - start));<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      LOG.info("After roll log in backup 
subprocedure, current log number: " + fsWAL.getFilenum()<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          + " on " + 
rss.getServerName());<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>      Connection connection = 
rss.getConnection();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      try (final BackupSystemTable table 
= new BackupSystemTable(connection)) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        // sanity check, good for 
testing<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        HashMap&lt;String, Long&gt; 
serverTimestampMap =<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            
table.readRegionServerLastLogRollResult(backupRoot);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        String host = 
rss.getServerName().getHostname();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        int port = 
rss.getServerName().getPort();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        String server = host + ":" + 
port;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        Long sts = 
serverTimestampMap.get(host);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        if (sts != null &amp;&amp; sts 
&gt; highest) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>          LOG.warn("Won't update server's 
last roll log result: current=" + sts + " new=" + highest);<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>          return null;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>        }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        // write the log number to backup 
system table.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        
table.writeRegionServerLastLogRollResult(server, highest, backupRoot);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>        return null;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      } catch (Exception e) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        LOG.error(e.toString(), e);<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        throw e;<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>  }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  private void rolllog() throws 
ForeignException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    monitor.rethrowException();<a 
name="line.126"></a>
+<span class="sourceLineNo">055</span>    super(member, 
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, errorListener,<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>        wakeFrequency, timeout);<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    LOG.info("Constructing a 
LogRollBackupSubprocedure.");<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    this.rss = rss;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    this.taskManager = taskManager;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    if (data != null) {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>      backupRoot = new String(data);<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><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Callable task. TODO. We don't need a 
thread pool to execute roll log. This can be simplified<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * with no use of sub-procedure pool.<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  class RSRollLogTask implements 
Callable&lt;Void&gt; {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    RSRollLogTask() {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>    @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    public Void call() throws Exception 
{<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      if (LOG.isDebugEnabled()) {<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>        LOG.debug("DRPC started: " + 
rss.getServerName());<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>      AbstractFSWAL&lt;?&gt; fsWAL = 
(AbstractFSWAL&lt;?&gt;) rss.getWAL(null);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      long filenum = 
fsWAL.getFilenum();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      List&lt;WAL&gt; wals = 
rss.getWALs();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      long highest = -1;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>      for (WAL wal : wals) {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>        if (wal == null) {<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>          continue;<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>        if (((AbstractFSWAL&lt;?&gt;) 
wal).getFilenum() &gt; highest) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>          highest = 
((AbstractFSWAL&lt;?&gt;) wal).getFilenum();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>        }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>      LOG.info("Trying to roll log in 
backup subprocedure, current log number: " + filenum<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          + " highest: " + highest + " on 
" + rss.getServerName());<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      ((HRegionServer) 
rss).getWalRoller().requestRollAll();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      long start = 
EnvironmentEdgeManager.currentTime();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      while (!((HRegionServer) 
rss).getWalRoller().walRollFinished()) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        Thread.sleep(20);<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      LOG.debug("log roll took " + 
(EnvironmentEdgeManager.currentTime() - start));<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      LOG.info("After roll log in backup 
subprocedure, current log number: " + fsWAL.getFilenum()<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          + " on " + 
rss.getServerName());<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>      Connection connection = 
rss.getConnection();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      try (final BackupSystemTable table 
= new BackupSystemTable(connection)) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        // sanity check, good for 
testing<a name="line.106"></a>
+<span class="sourceLineNo">107</span>        HashMap&lt;String, Long&gt; 
serverTimestampMap =<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            
table.readRegionServerLastLogRollResult(backupRoot);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        String host = 
rss.getServerName().getHostname();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        int port = 
rss.getServerName().getPort();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>        String server = host + ":" + 
port;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        Long sts = 
serverTimestampMap.get(host);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        if (sts != null &amp;&amp; sts 
&gt; highest) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>          LOG.warn("Won't update server's 
last roll log result: current=" + sts + " new="<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                  + highest);<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>          return null;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        // write the log number to backup 
system table.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        
table.writeRegionServerLastLogRollResult(server, highest, backupRoot);<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>        return null;<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      } catch (Exception e) {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>        LOG.error(e.toString(), e);<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>        throw e;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    taskManager.submitTask(new 
RSRollLogTask());<a name="line.128"></a>
+<span class="sourceLineNo">128</span>  private void rolllog() throws 
ForeignException {<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    monitor.rethrowException();<a 
name="line.129"></a>
 <span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    // wait for everything to complete.<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    
taskManager.waitForOutstandingTasks();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    monitor.rethrowException();<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><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public void acquireBarrier() throws 
ForeignException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    // do nothing, executing in inside 
barrier step.<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>  /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * do a log roll.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @return some bytes<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public byte[] insideBarrier() throws 
ForeignException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    rolllog();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    return null;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * Cancel threads if they haven't 
finished.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public void cleanup(Exception e) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    taskManager.abort("Aborting log roll 
subprocedure tasks for backup due to error", e);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<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>   * Hooray!<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  public void releaseBarrier() {<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    // NO OP<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>}<a name="line.167"></a>
+<span class="sourceLineNo">131</span>    taskManager.submitTask(new 
RSRollLogTask());<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    monitor.rethrowException();<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>    // wait for everything to complete.<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    
taskManager.waitForOutstandingTasks();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    monitor.rethrowException();<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public void acquireBarrier() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    // do nothing, executing in inside 
barrier step.<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>
+<span class="sourceLineNo">145</span>   * do a log roll.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @return some bytes<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>  public byte[] insideBarrier() throws 
ForeignException {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    rolllog();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    return null;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  /**<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Cancel threads if they haven't 
finished.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public void cleanup(Exception e) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    taskManager.abort("Aborting log roll 
subprocedure tasks for backup due to error", e);<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>   * Hooray!<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public void releaseBarrier() {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    // NO OP<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.html
index 55cec80..d161b4f 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedurePool.html
@@ -40,10 +40,10 @@
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.33"></a>
 <span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.DaemonThreadFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.38"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<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> * Handle running each of the individual 
tasks for completing a backup procedure on a region<a name="line.41"></a>
@@ -60,7 +60,7 @@
 <span class="sourceLineNo">052</span>  private final 
ExecutorCompletionService&lt;Void&gt; taskPool;<a name="line.52"></a>
 <span class="sourceLineNo">053</span>  private final ThreadPoolExecutor 
executor;<a name="line.53"></a>
 <span class="sourceLineNo">054</span>  private volatile boolean aborted;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  private final 
List&lt;Future&lt;Void&gt;&gt; futures = new 
ArrayList&lt;Future&lt;Void&gt;&gt;();<a name="line.55"></a>
+<span class="sourceLineNo">055</span>  private final 
List&lt;Future&lt;Void&gt;&gt; futures = new ArrayList&lt;&gt;();<a 
name="line.55"></a>
 <span class="sourceLineNo">056</span>  private final String name;<a 
name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
 <span class="sourceLineNo">058</span>  public 
LogRollBackupSubprocedurePool(String name, Configuration conf) {<a 
name="line.58"></a>
@@ -72,9 +72,9 @@
 <span class="sourceLineNo">064</span>    this.name = name;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span>    executor =<a name="line.65"></a>
 <span class="sourceLineNo">066</span>        new ThreadPoolExecutor(1, 
threads, keepAlive, TimeUnit.SECONDS,<a name="line.66"></a>
-<span class="sourceLineNo">067</span>            new 
LinkedBlockingQueue&lt;Runnable&gt;(), new DaemonThreadFactory("rs(" + name<a 
name="line.67"></a>
+<span class="sourceLineNo">067</span>            new 
LinkedBlockingQueue&lt;&gt;(), new DaemonThreadFactory("rs(" + name<a 
name="line.67"></a>
 <span class="sourceLineNo">068</span>                + ")-backup-pool"));<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    taskPool = new 
ExecutorCompletionService&lt;Void&gt;(executor);<a name="line.69"></a>
+<span class="sourceLineNo">069</span>    taskPool = new 
ExecutorCompletionService&lt;&gt;(executor);<a name="line.69"></a>
 <span class="sourceLineNo">070</span>  }<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
 <span class="sourceLineNo">072</span>  /**<a name="line.72"></a>

Reply via email to