http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f898168e/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html
index 666b264..9b020f4 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html
@@ -38,567 +38,584 @@
 <span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.master.MasterServices;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.master.ServerListener;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.ipc.RemoteException;<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><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.ArrayListMultimap;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.ByteString;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.RpcCallback;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.RpcController;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<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.ProtobufUtil;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest;<a
 name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionResponse;<a
 name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresRequest;<a
 name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresResponse;<a
 name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionRequest;<a
 name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse;<a
 name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RemoteProcedureRequest;<a
 name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>/**<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * A remote procecdure dispatcher for 
regionservers.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>@InterfaceAudience.Private<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>public class RSProcedureDispatcher<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    extends 
RemoteProcedureDispatcher&lt;MasterProcedureEnv, ServerName&gt;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    implements ServerListener {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RSProcedureDispatcher.class);<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static final String 
RS_RPC_STARTUP_WAIT_TIME_CONF_KEY =<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      
"hbase.regionserver.rpc.startup.waittime";<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private static final int 
DEFAULT_RS_RPC_STARTUP_WAIT_TIME = 60000;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  private static final int 
RS_VERSION_WITH_EXEC_PROCS = 0x0200000; // 2.0<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected final MasterServices 
master;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  private final long rsStartupWaitTime;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  private MasterProcedureEnv 
procedureEnv;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public RSProcedureDispatcher(final 
MasterServices master) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    super(master.getConfiguration());<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>    this.master = master;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>    this.rsStartupWaitTime = 
master.getConfiguration().getLong(<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      RS_RPC_STARTUP_WAIT_TIME_CONF_KEY, 
DEFAULT_RS_RPC_STARTUP_WAIT_TIME);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Override<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public boolean start() {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    if (!super.start()) {<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>      return false;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    
master.getServerManager().registerListener(this);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    procedureEnv = 
master.getMasterProcedureExecutor().getEnvironment();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    for (ServerName serverName: 
master.getServerManager().getOnlineServersList()) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      addNode(serverName);<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    return true;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public boolean stop() {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (!super.stop()) {<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      return false;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    
master.getServerManager().unregisterListener(this);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return true;<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 remoteDispatch(final 
ServerName serverName,<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      final Set&lt;RemoteProcedure&gt; 
remoteProcedures) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    final int rsVersion = 
master.getServerManager().getServerVersion(serverName);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    if (rsVersion &gt;= 
RS_VERSION_WITH_EXEC_PROCS) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      LOG.trace("Using procedure batch 
rpc execution for serverName={} version={}",<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        serverName, rsVersion);<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      submitTask(new 
ExecuteProceduresRemoteCall(serverName, remoteProcedures));<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>    } else {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      LOG.info(String.format(<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>        "Fallback to compat rpc execution 
for serverName=%s version=%s",<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        serverName, rsVersion));<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>      submitTask(new 
CompatRemoteProcedureResolver(serverName, remoteProcedures));<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><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  protected void 
abortPendingOperations(final ServerName serverName,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      final Set&lt;RemoteProcedure&gt; 
operations) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // TODO: Replace with a 
ServerNotOnlineException()<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    final IOException e = new 
DoNotRetryIOException("server not online " + serverName);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    for (RemoteProcedure proc: 
operations) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      proc.remoteCallFailed(procedureEnv, 
serverName, e);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public void serverAdded(final 
ServerName serverName) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    addNode(serverName);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  public void serverRemoved(final 
ServerName serverName) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    removeNode(serverName);<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>  /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * Base remote call<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  protected abstract class 
AbstractRSRemoteCall implements Callable&lt;Void&gt; {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    public abstract Void call();<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    private final ServerName 
serverName;<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    private int numberOfAttemptsSoFar = 
0;<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    private long maxWaitTime = -1;<a 
name="line.153"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.regionserver.RegionServerStoppedException;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.ipc.RemoteException;<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>import 
org.apache.hbase.thirdparty.com.google.common.collect.ArrayListMultimap;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.ByteString;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.RpcCallback;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.RpcController;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest;<a
 name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionResponse;<a
 name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresRequest;<a
 name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresResponse;<a
 name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionRequest;<a
 name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse;<a
 name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RemoteProcedureRequest;<a
 name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>/**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * A remote procecdure dispatcher for 
regionservers.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>@InterfaceAudience.Private<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>public class RSProcedureDispatcher<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    extends 
RemoteProcedureDispatcher&lt;MasterProcedureEnv, ServerName&gt;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    implements ServerListener {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RSProcedureDispatcher.class);<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public static final String 
RS_RPC_STARTUP_WAIT_TIME_CONF_KEY =<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      
"hbase.regionserver.rpc.startup.waittime";<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  private static final int 
DEFAULT_RS_RPC_STARTUP_WAIT_TIME = 60000;<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>  private static final int 
RS_VERSION_WITH_EXEC_PROCS = 0x0200000; // 2.0<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  protected final MasterServices 
master;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  private final long rsStartupWaitTime;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>  private MasterProcedureEnv 
procedureEnv;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public RSProcedureDispatcher(final 
MasterServices master) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    super(master.getConfiguration());<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>    this.master = master;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>    this.rsStartupWaitTime = 
master.getConfiguration().getLong(<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      RS_RPC_STARTUP_WAIT_TIME_CONF_KEY, 
DEFAULT_RS_RPC_STARTUP_WAIT_TIME);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  @Override<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public boolean start() {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>    if (!super.start()) {<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      return false;<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>    
master.getServerManager().registerListener(this);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    procedureEnv = 
master.getMasterProcedureExecutor().getEnvironment();<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    for (ServerName serverName: 
master.getServerManager().getOnlineServersList()) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      addNode(serverName);<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    return true;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>  @Override<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  public boolean stop() {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    if (!super.stop()) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>      return false;<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>    
master.getServerManager().unregisterListener(this);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    return true;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  protected void remoteDispatch(final 
ServerName serverName,<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      final Set&lt;RemoteProcedure&gt; 
remoteProcedures) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    final int rsVersion = 
master.getServerManager().getServerVersion(serverName);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (rsVersion &gt;= 
RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      LOG.trace("Using procedure batch 
rpc execution for serverName={} version={}", serverName,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        rsVersion);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      submitTask(new 
ExecuteProceduresRemoteCall(serverName, remoteProcedures));<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    } else if (rsVersion == 0 &amp;&amp; 
!master.getServerManager().isServerOnline(serverName)) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      submitTask(new 
DeadRSRemoteCall(serverName, remoteProcedures));<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    } else {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      LOG.info(String.format(<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>        "Fallback to compat rpc execution 
for serverName=%s version=%s",<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        serverName, rsVersion));<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>      submitTask(new 
CompatRemoteProcedureResolver(serverName, remoteProcedures));<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><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  @Override<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  protected void 
abortPendingOperations(final ServerName serverName,<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      final Set&lt;RemoteProcedure&gt; 
operations) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    // TODO: Replace with a 
ServerNotOnlineException()<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    final IOException e = new 
DoNotRetryIOException("server not online " + serverName);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    for (RemoteProcedure proc: 
operations) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      proc.remoteCallFailed(procedureEnv, 
serverName, e);<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><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  @Override<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  public void serverAdded(final 
ServerName serverName) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    addNode(serverName);<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public void serverRemoved(final 
ServerName serverName) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    removeNode(serverName);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   * Base remote call<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>   */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  protected abstract class 
AbstractRSRemoteCall implements Callable&lt;Void&gt; {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    public abstract Void call();<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    private final ServerName 
serverName;<a name="line.153"></a>
 <span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    public AbstractRSRemoteCall(final 
ServerName serverName) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      this.serverName = serverName;<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>    protected 
AdminService.BlockingInterface getRsAdmin() throws IOException {<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      final 
AdminService.BlockingInterface admin = 
master.getServerManager().getRsAdmin(serverName);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      if (admin == null) {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>        throw new IOException("Attempting 
to send OPEN RPC to server " + getServerName() +<a name="line.162"></a>
-<span class="sourceLineNo">163</span>          " failed because no RPC 
connection found to this server");<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      return admin;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    protected ServerName getServerName() 
{<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      return serverName;<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    protected boolean 
scheduleForRetry(final IOException e) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      // Should we wait a little before 
retrying? If the server is starting it's yes.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      final boolean hold = (e instanceof 
ServerNotRunningYetException);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if (hold) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        LOG.warn(String.format("waiting a 
little before trying on the same server=%s try=%d",<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            serverName, 
numberOfAttemptsSoFar), e);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        long now = 
EnvironmentEdgeManager.currentTime();<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        if (now &lt; getMaxWaitTime()) 
{<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          if (LOG.isDebugEnabled()) {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>            
LOG.debug(String.format("server is not yet up; waiting up to %dms",<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>              (getMaxWaitTime() - now)), 
e);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          submitTask(this, 100, 
TimeUnit.MILLISECONDS);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          return true;<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>        LOG.warn(String.format("server %s 
is not up for a while; try a new one", serverName), e);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        return false;<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>      // In case socket is timed out and 
the region server is still online,<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      // the openRegion RPC could have 
been accepted by the server and<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      // just the response didn't go 
through.  So we will retry to<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      // open the region on the same 
server.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      final boolean retry = !hold 
&amp;&amp; (e instanceof SocketTimeoutException<a name="line.196"></a>
-<span class="sourceLineNo">197</span>          &amp;&amp; 
master.getServerManager().isServerOnline(serverName));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      if (retry) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        // we want to retry as many times 
as needed as long as the RS is not dead.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        if (LOG.isDebugEnabled()) {<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>          
LOG.debug(String.format("Retrying to same RegionServer %s because: %s",<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>              serverName, 
e.getMessage()), e);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        submitTask(this);<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>        return true;<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>      }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>      // trying to send the request 
elsewhere instead<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      LOG.warn(String.format("Failed 
dispatch to server=%s try=%d",<a name="line.209"></a>
-<span class="sourceLineNo">210</span>                  serverName, 
numberOfAttemptsSoFar), e);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      return false;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    private long getMaxWaitTime() {<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>      if (this.maxWaitTime &lt; 0) {<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>        // This is the max attempts, not 
retries, so it should be at least 1.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>        this.maxWaitTime = 
EnvironmentEdgeManager.currentTime() + rsStartupWaitTime;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      return this.maxWaitTime;<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    protected IOException 
unwrapException(IOException e) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      if (e instanceof RemoteException) 
{<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        e = 
((RemoteException)e).unwrapRemoteException();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      return e;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  private interface 
RemoteProcedureResolver {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    void 
dispatchOpenRequests(MasterProcedureEnv env, List&lt;RegionOpenOperation&gt; 
operations);<a name="line.231"></a>
+<span class="sourceLineNo">155</span>    private int numberOfAttemptsSoFar = 
0;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    private long maxWaitTime = -1;<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    public AbstractRSRemoteCall(final 
ServerName serverName) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      this.serverName = serverName;<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>    protected 
AdminService.BlockingInterface getRsAdmin() throws IOException {<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      final 
AdminService.BlockingInterface admin = 
master.getServerManager().getRsAdmin(serverName);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      if (admin == null) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>        throw new IOException("Attempting 
to send OPEN RPC to server " + getServerName() +<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          " failed because no RPC 
connection found to this server");<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      return admin;<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>    protected ServerName getServerName() 
{<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      return serverName;<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    protected boolean 
scheduleForRetry(final IOException e) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      // Should we wait a little before 
retrying? If the server is starting it's yes.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      final boolean hold = (e instanceof 
ServerNotRunningYetException);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      if (hold) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        LOG.warn(String.format("waiting a 
little before trying on the same server=%s try=%d",<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            serverName, 
numberOfAttemptsSoFar), e);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        long now = 
EnvironmentEdgeManager.currentTime();<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        if (now &lt; getMaxWaitTime()) 
{<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          if (LOG.isDebugEnabled()) {<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>            
LOG.debug(String.format("server is not yet up; waiting up to %dms",<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>              (getMaxWaitTime() - now)), 
e);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>          }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          submitTask(this, 100, 
TimeUnit.MILLISECONDS);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          return true;<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>        LOG.warn(String.format("server %s 
is not up for a while; try a new one", serverName), e);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        return false;<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>      // In case socket is timed out and 
the region server is still online,<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      // the openRegion RPC could have 
been accepted by the server and<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      // just the response didn't go 
through.  So we will retry to<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      // open the region on the same 
server.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      final boolean retry = !hold 
&amp;&amp; (e instanceof SocketTimeoutException<a name="line.199"></a>
+<span class="sourceLineNo">200</span>          &amp;&amp; 
master.getServerManager().isServerOnline(serverName));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if (retry) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        // we want to retry as many times 
as needed as long as the RS is not dead.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        if (LOG.isDebugEnabled()) {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>          
LOG.debug(String.format("Retrying to same RegionServer %s because: %s",<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>              serverName, 
e.getMessage()), e);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        submitTask(this);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>        return true;<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>      // trying to send the request 
elsewhere instead<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      LOG.warn(String.format("Failed 
dispatch to server=%s try=%d",<a name="line.212"></a>
+<span class="sourceLineNo">213</span>                  serverName, 
numberOfAttemptsSoFar), e);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      return false;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>    private long getMaxWaitTime() {<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>      if (this.maxWaitTime &lt; 0) {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>        // This is the max attempts, not 
retries, so it should be at least 1.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        this.maxWaitTime = 
EnvironmentEdgeManager.currentTime() + rsStartupWaitTime;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      return this.maxWaitTime;<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>    protected IOException 
unwrapException(IOException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (e instanceof RemoteException) 
{<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        e = 
((RemoteException)e).unwrapRemoteException();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return e;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
 <span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>    void 
dispatchCloseRequests(MasterProcedureEnv env, List&lt;RegionCloseOperation&gt; 
operations);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    void 
dispatchServerOperations(MasterProcedureEnv env, List&lt;ServerOperation&gt; 
operations);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
+<span class="sourceLineNo">233</span>  private interface 
RemoteProcedureResolver {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    void 
dispatchOpenRequests(MasterProcedureEnv env, List&lt;RegionOpenOperation&gt; 
operations);<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>    void 
dispatchCloseRequests(MasterProcedureEnv env, List&lt;RegionCloseOperation&gt; 
operations);<a name="line.236"></a>
 <span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>  /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   * Fetches {@link 
org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteOperation}s<a
 name="line.239"></a>
-<span class="sourceLineNo">240</span>   * from the given {@code 
remoteProcedures} and groups them by class of the returned operation.<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>   * Then {@code resolver} is used to 
dispatch {@link RegionOpenOperation}s and<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * {@link RegionCloseOperation}s.<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>   * @param serverName RegionServer to 
which the remote operations are sent<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @param operations Remote procedures 
which are dispatched to the given server<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * @param resolver Used to dispatch 
remote procedures to given server.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public void 
splitAndResolveOperation(ServerName serverName, Set&lt;RemoteProcedure&gt; 
operations,<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      RemoteProcedureResolver resolver) 
{<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    MasterProcedureEnv env = 
master.getMasterProcedureExecutor().getEnvironment();<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    ArrayListMultimap&lt;Class&lt;?&gt;, 
RemoteOperation&gt; reqsByType =<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      buildAndGroupRequestByType(env, 
serverName, operations);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>    List&lt;RegionOpenOperation&gt; 
openOps = fetchType(reqsByType, RegionOpenOperation.class);<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>    if (!openOps.isEmpty()) {<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>      resolver.dispatchOpenRequests(env, 
openOps);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>    List&lt;RegionCloseOperation&gt; 
closeOps = fetchType(reqsByType, RegionCloseOperation.class);<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>    if (!closeOps.isEmpty()) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      resolver.dispatchCloseRequests(env, 
closeOps);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    List&lt;ServerOperation&gt; 
refreshOps = fetchType(reqsByType, ServerOperation.class);<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>    if (!refreshOps.isEmpty()) {<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>      
resolver.dispatchServerOperations(env, refreshOps);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    if (!reqsByType.isEmpty()) {<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>      LOG.warn("unknown request type in 
the queue: " + reqsByType);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>  // 
==========================================================================<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>  //  Compatibility calls<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>  // 
==========================================================================<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>  protected class 
ExecuteProceduresRemoteCall extends AbstractRSRemoteCall<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      implements RemoteProcedureResolver 
{<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    private final 
Set&lt;RemoteProcedure&gt; remoteProcedures;<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    private 
ExecuteProceduresRequest.Builder request = null;<a name="line.280"></a>
+<span class="sourceLineNo">238</span>    void 
dispatchServerOperations(MasterProcedureEnv env, List&lt;ServerOperation&gt; 
operations);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>  /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   * Fetches {@link 
org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteOperation}s<a
 name="line.242"></a>
+<span class="sourceLineNo">243</span>   * from the given {@code 
remoteProcedures} and groups them by class of the returned operation.<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>   * Then {@code resolver} is used to 
dispatch {@link RegionOpenOperation}s and<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * {@link RegionCloseOperation}s.<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>   * @param serverName RegionServer to 
which the remote operations are sent<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param operations Remote procedures 
which are dispatched to the given server<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param resolver Used to dispatch 
remote procedures to given server.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public void 
splitAndResolveOperation(ServerName serverName, Set&lt;RemoteProcedure&gt; 
operations,<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      RemoteProcedureResolver resolver) 
{<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    MasterProcedureEnv env = 
master.getMasterProcedureExecutor().getEnvironment();<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    ArrayListMultimap&lt;Class&lt;?&gt;, 
RemoteOperation&gt; reqsByType =<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      buildAndGroupRequestByType(env, 
serverName, operations);<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>    List&lt;RegionOpenOperation&gt; 
openOps = fetchType(reqsByType, RegionOpenOperation.class);<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    if (!openOps.isEmpty()) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>      resolver.dispatchOpenRequests(env, 
openOps);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>    List&lt;RegionCloseOperation&gt; 
closeOps = fetchType(reqsByType, RegionCloseOperation.class);<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>    if (!closeOps.isEmpty()) {<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>      resolver.dispatchCloseRequests(env, 
closeOps);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    List&lt;ServerOperation&gt; 
refreshOps = fetchType(reqsByType, ServerOperation.class);<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>    if (!refreshOps.isEmpty()) {<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>      
resolver.dispatchServerOperations(env, refreshOps);<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    if (!reqsByType.isEmpty()) {<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>      LOG.warn("unknown request type in 
the queue: " + reqsByType);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>  private class DeadRSRemoteCall extends 
ExecuteProceduresRemoteCall {<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    public DeadRSRemoteCall(ServerName 
serverName, Set&lt;RemoteProcedure&gt; remoteProcedures) {<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>      super(serverName, 
remoteProcedures);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
 <span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>    public 
ExecuteProceduresRemoteCall(final ServerName serverName,<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        final Set&lt;RemoteProcedure&gt; 
remoteProcedures) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      super(serverName);<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>      this.remoteProcedures = 
remoteProcedures;<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    public Void call() {<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>      request = 
ExecuteProceduresRequest.newBuilder();<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      if (LOG.isTraceEnabled()) {<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>        LOG.trace("Building request with 
operations count=" + remoteProcedures.size());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      
splitAndResolveOperation(getServerName(), remoteProcedures, this);<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>      try {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        sendRequest(getServerName(), 
request.build());<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      } catch (IOException e) {<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>        e = unwrapException(e);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>        // TODO: In the future some 
operation may want to bail out early.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        // TODO: How many times should we 
retry (use numberOfAttemptsSoFar)<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        if (!scheduleForRetry(e)) {<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>          remoteCallFailed(procedureEnv, 
e);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return null;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>    @Override<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    public void 
dispatchOpenRequests(final MasterProcedureEnv env,<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      
request.addOpenRegion(buildOpenRegionRequest(env, getServerName(), 
operations));<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void 
dispatchCloseRequests(final MasterProcedureEnv env,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        final 
List&lt;RegionCloseOperation&gt; operations) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      for (RegionCloseOperation op: 
operations) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        
request.addCloseRegion(op.buildCloseRegionRequest(getServerName()));<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    @Override<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    public void 
dispatchServerOperations(MasterProcedureEnv env, List&lt;ServerOperation&gt; 
operations) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      operations.stream().map(o -&gt; 
o.buildRequest()).forEachOrdered(request::addProc);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    protected ExecuteProceduresResponse 
sendRequest(final ServerName serverName,<a name="line.328"></a>
-<span class="sourceLineNo">329</span>        final ExecuteProceduresRequest 
request) throws IOException {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      try {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        return 
getRsAdmin().executeProcedures(null, request);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      } catch (ServiceException se) {<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>        throw 
ProtobufUtil.getRemoteException(se);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>    private void remoteCallFailed(final 
MasterProcedureEnv env, final IOException e) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      for (RemoteProcedure proc : 
remoteProcedures) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        proc.remoteCallFailed(env, 
getServerName(), e);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  private static OpenRegionRequest 
buildOpenRegionRequest(final MasterProcedureEnv env,<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      final ServerName serverName, final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    final OpenRegionRequest.Builder 
builder = OpenRegionRequest.newBuilder();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    
builder.setServerStartCode(serverName.getStartcode());<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    
builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime());<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>    for (RegionOpenOperation op: 
operations) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      
builder.addOpenInfo(op.buildRegionOpenInfoRequest(env));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    return builder.build();<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>  // 
==========================================================================<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>  //  Compatibility calls<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>  //  Since we don't have a "batch 
proc-exec" request on the target RS<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  //  we have to chunk the requests by 
type and dispatch the specific request.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  // 
==========================================================================<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>  /**<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * Compatibility class used by {@link 
CompatRemoteProcedureResolver} to open regions using old<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * {@link 
AdminService#openRegion(RpcController, OpenRegionRequest, RpcCallback)} rpc.<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>   */<a name="line.363"></a>
-<span class="sourceLineNo">364</span>  private final class 
OpenRegionRemoteCall extends AbstractRSRemoteCall {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    private final 
List&lt;RegionOpenOperation&gt; operations;<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span>    public OpenRegionRemoteCall(final 
ServerName serverName,<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      super(serverName);<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>      this.operations = operations;<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>    }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    @Override<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    public Void call() {<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>      final OpenRegionRequest request =<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>          
buildOpenRegionRequest(procedureEnv, getServerName(), operations);<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>      try {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>        sendRequest(getServerName(), 
request);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      } catch (IOException e) {<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>        e = unwrapException(e);<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>        // TODO: In the future some 
operation may want to bail out early.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>        // TODO: How many times should we 
retry (use numberOfAttemptsSoFar)<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        if (!scheduleForRetry(e)) {<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>          remoteCallFailed(procedureEnv, 
e);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      return null;<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>    private OpenRegionResponse 
sendRequest(final ServerName serverName,<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        final OpenRegionRequest request) 
throws IOException {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      try {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        return 
getRsAdmin().openRegion(null, request);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      } catch (ServiceException se) {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>        throw 
ProtobufUtil.getRemoteException(se);<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>    private void remoteCallFailed(final 
MasterProcedureEnv env, final IOException e) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      for (RegionOpenOperation op: 
operations) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        
op.getRemoteProcedure().remoteCallFailed(env, getServerName(), e);<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>  /**<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   * Compatibility class used by {@link 
CompatRemoteProcedureResolver} to close regions using old<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   * {@link 
AdminService#closeRegion(RpcController, CloseRegionRequest, RpcCallback)} 
rpc.<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   */<a name="line.410"></a>
-<span class="sourceLineNo">411</span>  private final class 
CloseRegionRemoteCall extends AbstractRSRemoteCall {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    private final RegionCloseOperation 
operation;<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>    public CloseRegionRemoteCall(final 
ServerName serverName,<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        final RegionCloseOperation 
operation) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      super(serverName);<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>      this.operation = operation;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>    @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    public Void call() {<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>      final CloseRegionRequest request = 
operation.buildCloseRegionRequest(getServerName());<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        CloseRegionResponse response = 
sendRequest(getServerName(), request);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>        remoteCallCompleted(procedureEnv, 
response);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      } catch (IOException e) {<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>        e = unwrapException(e);<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>        // TODO: In the future some 
operation may want to bail out early.<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // TODO: How many times should we 
retry (use numberOfAttemptsSoFar)<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        if (!scheduleForRetry(e)) {<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>          remoteCallFailed(procedureEnv, 
e);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      return null;<a name="line.434"></a>
+<span class="sourceLineNo">282</span>    @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    public Void call() {<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>      remoteCallFailed(procedureEnv,<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>        new 
RegionServerStoppedException("Server " + getServerName() + " is not 
online"));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      return null;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>  // 
==========================================================================<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>  //  Compatibility calls<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>  // 
==========================================================================<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>  protected class 
ExecuteProceduresRemoteCall extends AbstractRSRemoteCall<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      implements RemoteProcedureResolver 
{<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    protected final 
Set&lt;RemoteProcedure&gt; remoteProcedures;<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>    private 
ExecuteProceduresRequest.Builder request = null;<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>    public 
ExecuteProceduresRemoteCall(final ServerName serverName,<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        final Set&lt;RemoteProcedure&gt; 
remoteProcedures) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      super(serverName);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>      this.remoteProcedures = 
remoteProcedures;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>    @Override<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    public Void call() {<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>      request = 
ExecuteProceduresRequest.newBuilder();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      if (LOG.isTraceEnabled()) {<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>        LOG.trace("Building request with 
operations count=" + remoteProcedures.size());<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      
splitAndResolveOperation(getServerName(), remoteProcedures, this);<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>      try {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        sendRequest(getServerName(), 
request.build());<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      } catch (IOException e) {<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>        e = unwrapException(e);<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>        // TODO: In the future some 
operation may want to bail out early.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        // TODO: How many times should we 
retry (use numberOfAttemptsSoFar)<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        if (!scheduleForRetry(e)) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>          remoteCallFailed(procedureEnv, 
e);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      return null;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>    @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    public void 
dispatchOpenRequests(final MasterProcedureEnv env,<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      
request.addOpenRegion(buildOpenRegionRequest(env, getServerName(), 
operations));<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    @Override<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    public void 
dispatchCloseRequests(final MasterProcedureEnv env,<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        final 
List&lt;RegionCloseOperation&gt; operations) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      for (RegionCloseOperation op: 
operations) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        
request.addCloseRegion(op.buildCloseRegionRequest(getServerName()));<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>      }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>    @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    public void 
dispatchServerOperations(MasterProcedureEnv env, List&lt;ServerOperation&gt; 
operations) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      operations.stream().map(o -&gt; 
o.buildRequest()).forEachOrdered(request::addProc);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>    protected ExecuteProceduresResponse 
sendRequest(final ServerName serverName,<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        final ExecuteProceduresRequest 
request) throws IOException {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      try {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        return 
getRsAdmin().executeProcedures(null, request);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      } catch (ServiceException se) {<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>        throw 
ProtobufUtil.getRemoteException(se);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span>    protected void remoteCallFailed(final 
MasterProcedureEnv env, final IOException e) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      for (RemoteProcedure proc : 
remoteProcedures) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        proc.remoteCallFailed(env, 
getServerName(), e);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    }<a name="line.358"></a>
+<span class="sourceLineNo">359</span>  }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span>  private static OpenRegionRequest 
buildOpenRegionRequest(final MasterProcedureEnv env,<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      final ServerName serverName, final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    final OpenRegionRequest.Builder 
builder = OpenRegionRequest.newBuilder();<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    
builder.setServerStartCode(serverName.getStartcode());<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    
builder.setMasterSystemTime(EnvironmentEdgeManager.currentTime());<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>    for (RegionOpenOperation op: 
operations) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      
builder.addOpenInfo(op.buildRegionOpenInfoRequest(env));<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    return builder.build();<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>  // 
==========================================================================<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>  //  Compatibility calls<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>  //  Since we don't have a "batch 
proc-exec" request on the target RS<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  //  we have to chunk the requests by 
type and dispatch the specific request.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>  // 
==========================================================================<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>  /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * Compatibility class used by {@link 
CompatRemoteProcedureResolver} to open regions using old<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   * {@link 
AdminService#openRegion(RpcController, OpenRegionRequest, RpcCallback)} rpc.<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>   */<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  private final class 
OpenRegionRemoteCall extends AbstractRSRemoteCall {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    private final 
List&lt;RegionOpenOperation&gt; operations;<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>    public OpenRegionRemoteCall(final 
ServerName serverName,<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      super(serverName);<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>      this.operations = operations;<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>    @Override<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    public Void call() {<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      final OpenRegionRequest request =<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>          
buildOpenRegionRequest(procedureEnv, getServerName(), operations);<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>      try {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        sendRequest(getServerName(), 
request);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      } catch (IOException e) {<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>        e = unwrapException(e);<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>        // TODO: In the future some 
operation may want to bail out early.<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        // TODO: How many times should we 
retry (use numberOfAttemptsSoFar)<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if (!scheduleForRetry(e)) {<a 
name="line.401"></a>
+<span class="sourceLineNo">402</span>          remoteCallFailed(procedureEnv, 
e);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      return null;<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>    private OpenRegionResponse 
sendRequest(final ServerName serverName,<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        final OpenRegionRequest request) 
throws IOException {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      try {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        return 
getRsAdmin().openRegion(null, request);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      } catch (ServiceException se) {<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>        throw 
ProtobufUtil.getRemoteException(se);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    }<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>    private void remoteCallFailed(final 
MasterProcedureEnv env, final IOException e) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      for (RegionOpenOperation op: 
operations) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        
op.getRemoteProcedure().remoteCallFailed(env, getServerName(), e);<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>      }<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    }<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  /**<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   * Compatibility class used by {@link 
CompatRemoteProcedureResolver} to close regions using old<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   * {@link 
AdminService#closeRegion(RpcController, CloseRegionRequest, RpcCallback)} 
rpc.<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   */<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  private final class 
CloseRegionRemoteCall extends AbstractRSRemoteCall {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    private final RegionCloseOperation 
operation;<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>    public CloseRegionRemoteCall(final 
ServerName serverName,<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        final RegionCloseOperation 
operation) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      super(serverName);<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>      this.operation = operation;<a 
name="line.434"></a>
 <span class="sourceLineNo">435</span>    }<a name="line.435"></a>
 <span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>    private CloseRegionResponse 
sendRequest(final ServerName serverName,<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        final CloseRegionRequest request) 
throws IOException {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      try {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>        return 
getRsAdmin().closeRegion(null, request);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      } catch (ServiceException se) {<a 
name="line.441"></a>
-<span class="sourceLineNo">442</span>        throw 
ProtobufUtil.getRemoteException(se);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    private void 
remoteCallCompleted(final MasterProcedureEnv env,<a name="line.446"></a>
-<span class="sourceLineNo">447</span>        final CloseRegionResponse 
response) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      
operation.setClosed(response.getClosed());<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    private void remoteCallFailed(final 
MasterProcedureEnv env, final IOException e) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      
operation.getRemoteProcedure().remoteCallFailed(env, getServerName(), e);<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>    }<a name="line.453"></a>
-<span class="sourceLineNo">454</span>  }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span>  /**<a name="line.456"></a>
-<span class="sourceLineNo">457</span>   * Compatibility class to open and 
close regions using old endpoints (openRegion/closeRegion) in<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>   * {@link AdminService}.<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>   */<a name="line.459"></a>
-<span class="sourceLineNo">460</span>  protected class 
CompatRemoteProcedureResolver implements Callable&lt;Void&gt;, 
RemoteProcedureResolver {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    private final 
Set&lt;RemoteProcedure&gt; operations;<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    private final ServerName 
serverName;<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>    public 
CompatRemoteProcedureResolver(final ServerName serverName,<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>        final Set&lt;RemoteProcedure&gt; 
operations) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      this.serverName = serverName;<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>      this.operations = operations;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>    }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>    @Override<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    public Void call() {<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span>      
splitAndResolveOperation(serverName, operations, this);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      return null;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span>    @Override<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    public void 
dispatchOpenRequests(final MasterProcedureEnv env,<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        final 
List&lt;RegionOpenOperation&gt; operations) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      submitTask(new 
OpenRegionRemoteCall(serverName, operations));<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    @Override<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    public void 
dispatchCloseRequests(final MasterProcedureEnv env,<a name="line.483"></a>
-<span class="sourceLineNo">484</span>        final 
List&lt;RegionCloseOperation&gt; operations) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      for (RegionCloseOperation op: 
operations) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>        submitTask(new 
CloseRegionRemoteCall(serverName, op));<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>    @Override<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    public void 
dispatchServerOperations(MasterProcedureEnv env, List&lt;ServerOperation&gt; 
operations) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      throw new 
UnsupportedOperationException();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>  }<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>  // 
==========================================================================<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>  //  RPC Messages<a name="line.497"></a>
-<span class="sourceLineNo">498</span>  //  - ServerOperation: refreshConfig, 
grant, revoke, ... (TODO)<a name="line.498"></a>
-<span class="sourceLineNo">499</span>  //  - RegionOperation: open, close, 
flush, snapshot, ...<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  // 
==========================================================================<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  public static final class 
ServerOperation extends RemoteOperation {<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>    private final long procId;<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>    private final Class&lt;?&gt; 
rsProcClass;<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>    private final byte[] rsProcData;<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>    public 
ServerOperation(RemoteProcedure remoteProcedure, long procId, Class&lt;?&gt; 
rsProcClass,<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        byte[] rsProcData) {<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>      super(remoteProcedure);<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      this.procId = procId;<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>      this.rsProcClass = rsProcClass;<a 
name="line.514"></a>
-<span class="sourceLineNo">515</span>      this.rsProcData = rsProcData;<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>    public RemoteProcedureRequest 
buildRequest() {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      return 
RemoteProcedureRequest.newBuilder().setProcId(procId)<a name="line.519"></a>
-<span class="sourceLineNo">520</span>          
.setProcClass(rsProcClass.getName()).setProcData(ByteString.copyFrom(rsProcData)).build();<a
 name="line.520"></a>
-<span class="sourceLineNo">521</span>    }<a name="line.521"></a>
-<span class="sourceLineNo">522</span>  }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span>  public static abstract class RegionOpe

<TRUNCATED>

Reply via email to