http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b707139a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.html
index 05fc31d..191bf86 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.html
@@ -26,128 +26,212 @@
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.master.replication;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.client.replication.ReplicationPeerConfigUtil;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.master.MasterCoprocessorHost;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerDescription;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.replication.ReplicationUtils;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.slf4j.Logger;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.slf4j.LoggerFactory;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.UpdatePeerConfigStateData;<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> * The procedure for updating the config 
for a replication peer.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> */<a name="line.37"></a>
-<span class="sourceLineNo">038</span>@InterfaceAudience.Private<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>public class UpdatePeerConfigProcedure 
extends ModifyPeerProcedure {<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private static final Logger LOG = 
LoggerFactory.getLogger(UpdatePeerConfigProcedure.class);<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  private ReplicationPeerConfig 
peerConfig;<a name="line.43"></a>
+<span class="sourceLineNo">021</span>import java.util.ArrayList;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.HashMap;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.List;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.Map;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.client.replication.ReplicationPeerConfigUtil;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.master.MasterCoprocessorHost;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerDescription;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueStorage;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.replication.ReplicationUtils;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.PeerModificationState;<a
 name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.UpdatePeerConfigStateData;<a
 name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private ReplicationPeerConfig 
oldPeerConfig;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  private boolean enabled;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public UpdatePeerConfigProcedure() {<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  public UpdatePeerConfigProcedure(String 
peerId, ReplicationPeerConfig peerConfig) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    super(peerId);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    this.peerConfig = peerConfig;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
+<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * The procedure for updating the config 
for a replication peer.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@InterfaceAudience.Private<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class UpdatePeerConfigProcedure 
extends ModifyPeerProcedure {<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  private static final Logger LOG = 
LoggerFactory.getLogger(UpdatePeerConfigProcedure.class);<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  private ReplicationPeerConfig 
peerConfig;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  private ReplicationPeerConfig 
oldPeerConfig;<a name="line.55"></a>
 <span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  @Override<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public PeerOperationType 
getPeerOperationType() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    return 
PeerOperationType.UPDATE_CONFIG;<a name="line.59"></a>
+<span class="sourceLineNo">057</span>  private boolean enabled;<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public UpdatePeerConfigProcedure() {<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>  @Override<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  protected boolean 
reopenRegionsAfterRefresh() {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    // If we remove some tables from the 
peer config then we do not need to enter the extra states<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    // for serial replication. Could try 
to optimize later since it is not easy to determine this...<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    return peerConfig.isSerial() 
&amp;&amp; (!oldPeerConfig.isSerial() ||<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      
!ReplicationUtils.isNamespacesAndTableCFsEqual(peerConfig, oldPeerConfig));<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>  @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected boolean 
enablePeerBeforeFinish() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // do not need to test 
reopenRegionsAfterRefresh since we can only enter here if<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    // reopenRegionsAfterRefresh returns 
true.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    return enabled;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  @Override<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  protected ReplicationPeerConfig 
getOldPeerConfig() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    return oldPeerConfig;<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>
-<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  protected ReplicationPeerConfig 
getNewPeerConfig() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    return peerConfig;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>  @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  protected void 
prePeerModification(MasterProcedureEnv env) throws IOException {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>    MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    if (cpHost != null) {<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      
cpHost.preUpdateReplicationPeerConfig(peerId, peerConfig);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    ReplicationPeerDescription desc =<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      
env.getReplicationPeerManager().preUpdatePeerConfig(peerId, peerConfig);<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>    oldPeerConfig = 
desc.getPeerConfig();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    enabled = desc.isEnabled();<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  protected void 
updatePeerStorage(MasterProcedureEnv env) throws ReplicationException {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    
env.getReplicationPeerManager().updatePeerConfig(peerId, peerConfig);<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    if (enabled &amp;&amp; 
reopenRegionsAfterRefresh()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      
env.getReplicationPeerManager().disablePeer(peerId);<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><a name="line.106"></a>
-<span class="sourceLineNo">107</span>  @Override<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  protected void 
postPeerModification(MasterProcedureEnv env)<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      throws IOException, 
ReplicationException {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    if (oldPeerConfig.isSerial() 
&amp;&amp; !peerConfig.isSerial()) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      
env.getReplicationPeerManager().removeAllLastPushedSeqIds(peerId);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    LOG.info("Successfully updated peer 
config of {} to {}", peerId, peerConfig);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (cpHost != null) {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      
cpHost.postUpdateReplicationPeerConfig(peerId, peerConfig);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  @Override<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  protected void 
serializeStateData(ProcedureStateSerializer serializer) throws IOException {<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>    
super.serializeStateData(serializer);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    UpdatePeerConfigStateData.Builder 
builder = UpdatePeerConfigStateData.newBuilder()<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      
.setPeerConfig(ReplicationPeerConfigUtil.convert(peerConfig));<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    if (oldPeerConfig != null) {<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>      
builder.setOldPeerConfig(ReplicationPeerConfigUtil.convert(oldPeerConfig));<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    
serializer.serialize(builder.build());<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>  @Override<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  protected void 
deserializeStateData(ProcedureStateSerializer serializer) throws IOException 
{<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    
super.deserializeStateData(serializer);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    UpdatePeerConfigStateData data = 
serializer.deserialize(UpdatePeerConfigStateData.class);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    peerConfig = 
ReplicationPeerConfigUtil.convert(data.getPeerConfig());<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    if (data.hasOldPeerConfig()) {<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      oldPeerConfig = 
ReplicationPeerConfigUtil.convert(data.getOldPeerConfig());<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    } else {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      oldPeerConfig = null;<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">062</span>  public UpdatePeerConfigProcedure(String 
peerId, ReplicationPeerConfig peerConfig) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    super(peerId);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    this.peerConfig = peerConfig;<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>  @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public PeerOperationType 
getPeerOperationType() {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    return 
PeerOperationType.UPDATE_CONFIG;<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>  private void 
addToList(List&lt;String&gt; encodedRegionNames, String encodedRegionName,<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>      ReplicationQueueStorage 
queueStorage) throws ReplicationException {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    
encodedRegionNames.add(encodedRegionName);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    if (encodedRegionNames.size() &gt;= 
UPDATE_LAST_SEQ_ID_BATCH_SIZE) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      
queueStorage.removeLastSequenceIds(peerId, encodedRegionNames);<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>      encodedRegionNames.clear();<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><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  @Override<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  protected PeerModificationState 
nextStateAfterRefresh() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    if (peerConfig.isSerial()) {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>      if (oldPeerConfig.isSerial()) {<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>        // both serial, then if the 
ns/table-cfs configs are not changed, just go with the normal<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>        // way, otherwise we need to 
reopen the regions for the newly added tables.<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        return 
ReplicationUtils.isNamespacesAndTableCFsEqual(peerConfig, oldPeerConfig)<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>          ? 
super.nextStateAfterRefresh()<a name="line.88"></a>
+<span class="sourceLineNo">089</span>          : 
PeerModificationState.SERIAL_PEER_REOPEN_REGIONS;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      } else {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        // we change the peer to serial, 
need to reopen all regions<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        return 
PeerModificationState.SERIAL_PEER_REOPEN_REGIONS;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    } else {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      if (oldPeerConfig.isSerial()) {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>        // we remove the serial flag for 
peer, then we do not need to reopen all regions, but we<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        // need to remove the last pushed 
sequence ids.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        return 
PeerModificationState.SERIAL_PEER_UPDATE_LAST_PUSHED_SEQ_ID;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      } else {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        // not serial for both, just go 
with the normal way.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        return 
super.nextStateAfterRefresh();<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><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  @Override<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  protected void 
updateLastPushedSequenceIdForSerialPeer(MasterProcedureEnv env)<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      throws IOException, 
ReplicationException {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    if (!oldPeerConfig.isSerial()) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      assert peerConfig.isSerial();<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      // change to serial<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      setLastPushedSequenceId(env, 
peerConfig);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      return;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    if (!peerConfig.isSerial()) {<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>      // remove the serial flag<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      
env.getReplicationPeerManager().removeAllLastPushedSeqIds(peerId);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      return;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    // enter here means peerConfig and 
oldPeerConfig are both serial, let's find out the diffs and<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    // process them<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    ReplicationQueueStorage queueStorage 
= env.getReplicationPeerManager().getQueueStorage();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    Connection conn = 
env.getMasterServices().getConnection();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Map&lt;String, Long&gt; lastSeqIds = 
new HashMap&lt;String, Long&gt;();<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    List&lt;String&gt; encodedRegionNames 
= new ArrayList&lt;&gt;();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    for (TableDescriptor td : 
env.getMasterServices().getTableDescriptors().getAll().values()) {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>      if 
(!td.hasGlobalReplicationScope()) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        continue;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      TableName tn = td.getTableName();<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>      if 
(ReplicationUtils.contains(oldPeerConfig, tn)) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        if 
(!ReplicationUtils.contains(peerConfig, tn)) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          // removed from peer config<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>          for (String encodedRegionName : 
MetaTableAccessor<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            
.getTableEncodedRegionNamesForSerialReplication(conn, tn)) {<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>            addToList(encodedRegionNames, 
encodedRegionName, queueStorage);<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>      } else if 
(ReplicationUtils.contains(peerConfig, tn)) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        // newly added to peer config<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>        
setLastPushedSequenceIdForTable(env, tn, lastSeqIds);<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>    if (!encodedRegionNames.isEmpty()) 
{<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      
queueStorage.removeLastSequenceIds(peerId, encodedRegionNames);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    if (!lastSeqIds.isEmpty()) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>      
queueStorage.setLastSequenceIds(peerId, lastSeqIds);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<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>  @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  protected boolean 
enablePeerBeforeFinish() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    // do not need to test 
reopenRegionsAfterRefresh since we can only enter here if<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    // reopenRegionsAfterRefresh returns 
true.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    return enabled;<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>  @Override<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  protected ReplicationPeerConfig 
getOldPeerConfig() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return oldPeerConfig;<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>  protected ReplicationPeerConfig 
getNewPeerConfig() {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    return peerConfig;<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  protected void 
prePeerModification(MasterProcedureEnv env) throws IOException {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>    MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    if (cpHost != null) {<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>      
cpHost.preUpdateReplicationPeerConfig(peerId, peerConfig);<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    ReplicationPeerDescription desc =<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      
env.getReplicationPeerManager().preUpdatePeerConfig(peerId, peerConfig);<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    oldPeerConfig = 
desc.getPeerConfig();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    enabled = desc.isEnabled();<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>  @Override<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  protected void 
updatePeerStorage(MasterProcedureEnv env) throws ReplicationException {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    
env.getReplicationPeerManager().updatePeerConfig(peerId, peerConfig);<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>    // if we need to jump to the special 
states for serial peers, then we need to disable the peer<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    // first if it is not disabled yet.<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    if (enabled &amp;&amp; 
nextStateAfterRefresh() != super.nextStateAfterRefresh()) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>      
env.getReplicationPeerManager().disablePeer(peerId);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>  @Override<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  protected void 
postPeerModification(MasterProcedureEnv env)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      throws IOException, 
ReplicationException {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (oldPeerConfig.isSerial() 
&amp;&amp; !peerConfig.isSerial()) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      
env.getReplicationPeerManager().removeAllLastPushedSeqIds(peerId);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    LOG.info("Successfully updated peer 
config of {} to {}", peerId, peerConfig);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    if (cpHost != null) {<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>      
cpHost.postUpdateReplicationPeerConfig(peerId, peerConfig);<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  protected void 
serializeStateData(ProcedureStateSerializer serializer) throws IOException {<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    
super.serializeStateData(serializer);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    UpdatePeerConfigStateData.Builder 
builder = UpdatePeerConfigStateData.newBuilder()<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      
.setPeerConfig(ReplicationPeerConfigUtil.convert(peerConfig));<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>    if (oldPeerConfig != null) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>      
builder.setOldPeerConfig(ReplicationPeerConfigUtil.convert(oldPeerConfig));<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    
serializer.serialize(builder.build());<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  @Override<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  protected void 
deserializeStateData(ProcedureStateSerializer serializer) throws IOException 
{<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    
super.deserializeStateData(serializer);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    UpdatePeerConfigStateData data = 
serializer.deserialize(UpdatePeerConfigStateData.class);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    peerConfig = 
ReplicationPeerConfigUtil.convert(data.getPeerConfig());<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    if (data.hasOldPeerConfig()) {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>      oldPeerConfig = 
ReplicationPeerConfigUtil.convert(data.getOldPeerConfig());<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    } else {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      oldPeerConfig = null;<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>}<a name="line.226"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b707139a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueueStorage.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueueStorage.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueueStorage.html
index 85bc027..a9cc532 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueueStorage.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueueStorage.html
@@ -99,109 +99,118 @@
 <span class="sourceLineNo">091</span>   * @param peerId peer id<a 
name="line.91"></a>
 <span class="sourceLineNo">092</span>   */<a name="line.92"></a>
 <span class="sourceLineNo">093</span>  void removeLastSequenceIds(String 
peerId) throws ReplicationException;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * Get the current position for a 
specific WAL in a given queue for a given regionserver.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @param serverName the name of the 
regionserver<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * @param queueId a String that 
identifies the queue<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * @param fileName name of the WAL<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @return the current position in the 
file<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  long getWALPosition(ServerName 
serverName, String queueId, String fileName)<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      throws ReplicationException;<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>   * Get a list of all WALs in the given 
queue on the given region server.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * @param serverName the server name of 
the region server that owns the queue<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @param queueId a String that 
identifies the queue<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   * @return a list of WALs<a 
name="line.108"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * Remove the max sequence id record 
for the given peer and regions.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   * @param peerId peer id<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>   * @param encodedRegionNames the 
encoded region names<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   */<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  void removeLastSequenceIds(String 
peerId, List&lt;String&gt; encodedRegionNames)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      throws ReplicationException;<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>   * Get the current position for a 
specific WAL in a given queue for a given regionserver.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param serverName the name of the 
regionserver<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @param queueId a String that 
identifies the queue<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @param fileName name of the WAL<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return the current position in the 
file<a name="line.108"></a>
 <span class="sourceLineNo">109</span>   */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  List&lt;String&gt; 
getWALsInQueue(ServerName serverName, String queueId) throws 
ReplicationException;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * Get a list of all queues for the 
specified region server.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @param serverName the server name of 
the region server that owns the set of queues<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @return a list of queueIds<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  List&lt;String&gt; 
getAllQueues(ServerName serverName) throws ReplicationException;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * Change ownership for the queue 
identified by queueId and belongs to a dead region server.<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @param sourceServerName the name of 
the dead region server<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @param destServerName the name of 
the target region server<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @param queueId the id of the queue<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   * @return the new PeerId and A 
SortedSet of WALs in its queue<a name="line.124"></a>
+<span class="sourceLineNo">110</span>  long getWALPosition(ServerName 
serverName, String queueId, String fileName)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      throws ReplicationException;<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * Get a list of all WALs in the given 
queue on the given region server.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param serverName the server name of 
the region server that owns the queue<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @param queueId a String that 
identifies the queue<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * @return a list of WALs<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  List&lt;String&gt; 
getWALsInQueue(ServerName serverName, String queueId) throws 
ReplicationException;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * Get a list of all queues for the 
specified region server.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * @param serverName the server name of 
the region server that owns the set of queues<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * @return a list of queueIds<a 
name="line.124"></a>
 <span class="sourceLineNo">125</span>   */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  Pair&lt;String, 
SortedSet&lt;String&gt;&gt; claimQueue(ServerName sourceServerName, String 
queueId,<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      ServerName destServerName) throws 
ReplicationException;<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>   * Remove the record of region server 
if the queue is empty.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  void 
removeReplicatorIfQueueIsEmpty(ServerName serverName) throws 
ReplicationException;<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * Get a list of all region servers 
that have outstanding replication queues. These servers could<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>   * be alive, dead or from a previous 
run of the cluster.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   * @return a list of server names<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  List&lt;ServerName&gt; 
getListOfReplicators() throws ReplicationException;<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>   * Load all wals in all replication 
queues. This method guarantees to return a snapshot which<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * contains all WALs at the start of 
this call even there is concurrent queue failover. However,<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>   * some newly created WALs during the 
call may not be included.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  Set&lt;String&gt; getAllWALs() throws 
ReplicationException;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Add a peer to hfile reference queue 
if peer does not exist.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * @param peerId peer cluster id to be 
added<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * @throws ReplicationException if 
fails to add a peer id to hfile reference queue<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  void addPeerToHFileRefs(String peerId) 
throws ReplicationException;<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   * Remove a peer from hfile reference 
queue.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   * @param peerId peer cluster id to be 
removed<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  void removePeerFromHFileRefs(String 
peerId) throws ReplicationException;<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>   * Add new hfile references to the 
queue.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @param peerId peer cluster id to 
which the hfiles need to be replicated<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @param pairs list of pairs of { 
HFile location in staging dir, HFile path in region dir which<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>   *          will be added in the queue 
}<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @throws ReplicationException if 
fails to add a hfile reference<a name="line.166"></a>
+<span class="sourceLineNo">126</span>  List&lt;String&gt; 
getAllQueues(ServerName serverName) throws ReplicationException;<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  /**<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * Change ownership for the queue 
identified by queueId and belongs to a dead region server.<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>   * @param sourceServerName the name of 
the dead region server<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @param destServerName the name of 
the target region server<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @param queueId the id of the queue<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   * @return the new PeerId and A 
SortedSet of WALs in its queue<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  Pair&lt;String, 
SortedSet&lt;String&gt;&gt; claimQueue(ServerName sourceServerName, String 
queueId,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      ServerName destServerName) throws 
ReplicationException;<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>   * Remove the record of region server 
if the queue is empty.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  void 
removeReplicatorIfQueueIsEmpty(ServerName serverName) throws 
ReplicationException;<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>   * Get a list of all region servers 
that have outstanding replication queues. These servers could<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>   * be alive, dead or from a previous 
run of the cluster.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @return a list of server names<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  List&lt;ServerName&gt; 
getListOfReplicators() throws ReplicationException;<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * Load all wals in all replication 
queues. This method guarantees to return a snapshot which<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   * contains all WALs at the start of 
this call even there is concurrent queue failover. However,<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>   * some newly created WALs during the 
call may not be included.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  Set&lt;String&gt; getAllWALs() throws 
ReplicationException;<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>  /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span>   * Add a peer to hfile reference queue 
if peer does not exist.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   * @param peerId peer cluster id to be 
added<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   * @throws ReplicationException if 
fails to add a peer id to hfile reference queue<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   */<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  void addPeerToHFileRefs(String peerId) 
throws ReplicationException;<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   * Remove a peer from hfile reference 
queue.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   * @param peerId peer cluster id to be 
removed<a name="line.166"></a>
 <span class="sourceLineNo">167</span>   */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  void addHFileRefs(String peerId, 
List&lt;Pair&lt;Path, Path&gt;&gt; pairs) throws ReplicationException;<a 
name="line.168"></a>
+<span class="sourceLineNo">168</span>  void removePeerFromHFileRefs(String 
peerId) throws ReplicationException;<a name="line.168"></a>
 <span class="sourceLineNo">169</span><a name="line.169"></a>
 <span class="sourceLineNo">170</span>  /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * Remove hfile references from the 
queue.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * @param peerId peer cluster id from 
which this hfile references needs to be removed<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * @param files list of hfile 
references to be removed<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  void removeHFileRefs(String peerId, 
List&lt;String&gt; files) throws ReplicationException;<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   * Get list of all peers from hfile 
reference queue.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @return a list of peer ids<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>   */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  List&lt;String&gt; 
getAllPeersFromHFileRefsQueue() throws ReplicationException;<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * Get a list of all hfile references 
in the given peer.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   * @param peerId a String that 
identifies the peer<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @return a list of hfile references<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>   */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  List&lt;String&gt; 
getReplicableHFiles(String peerId) throws ReplicationException;<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>  /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * Load all hfile references in all 
replication queues. This method guarantees to return a<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * snapshot which contains all hfile 
references at the start of this call. However, some newly<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * created hfile references during the 
call may not be included.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  Set&lt;String&gt; getAllHFileRefs() 
throws ReplicationException;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>}<a name="line.196"></a>
+<span class="sourceLineNo">171</span>   * Add new hfile references to the 
queue.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param peerId peer cluster id to 
which the hfiles need to be replicated<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @param pairs list of pairs of { 
HFile location in staging dir, HFile path in region dir which<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>   *          will be added in the queue 
}<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * @throws ReplicationException if 
fails to add a hfile reference<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  void addHFileRefs(String peerId, 
List&lt;Pair&lt;Path, Path&gt;&gt; pairs) throws ReplicationException;<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>  /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * Remove hfile references from the 
queue.<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * @param peerId peer cluster id from 
which this hfile references needs to be removed<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * @param files list of hfile 
references to be removed<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  void removeHFileRefs(String peerId, 
List&lt;String&gt; files) throws ReplicationException;<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  /**<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * Get list of all peers from hfile 
reference queue.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @return a list of peer ids<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>   */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  List&lt;String&gt; 
getAllPeersFromHFileRefsQueue() throws ReplicationException;<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Get a list of all hfile references 
in the given peer.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * @param peerId a String that 
identifies the peer<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * @return a list of hfile references<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>   */<a name="line.196"></a>
+<span class="sourceLineNo">197</span>  List&lt;String&gt; 
getReplicableHFiles(String peerId) throws ReplicationException;<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>  /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   * Load all hfile references in all 
replication queues. This method guarantees to return a<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   * snapshot which contains all hfile 
references at the start of this call. However, some newly<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * created hfile references during the 
call may not be included.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  Set&lt;String&gt; getAllHFileRefs() 
throws ReplicationException;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>}<a name="line.205"></a>
 
 
 

Reply via email to