http://git-wip-us.apache.org/repos/asf/hbase-site/blob/323b17d9/devapidocs/src-html/org/apache/hadoop/hbase/master/DeadServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/DeadServer.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/DeadServer.html
index 905ad99..da85524 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/DeadServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/DeadServer.html
@@ -33,198 +33,241 @@
 <span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.25"></a>
 <span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.26"></a>
 <span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.ArrayList;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.Collections;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Comparator;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.Date;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.HashMap;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.util.HashSet;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import java.util.Iterator;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import java.util.List;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import java.util.Map;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import java.util.Set;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Class to hold dead servers list and 
utility querying dead server list.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * On znode expiration, servers are added 
here.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>public class DeadServer {<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>  private static final Logger LOG = 
LoggerFactory.getLogger(DeadServer.class);<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  /**<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   * Set of known dead servers.  On znode 
expiration, servers are added here.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   * This is needed in case of a network 
partitioning where the server's lease<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * expires, but the server is still 
running. After the network is healed,<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   * and it's server logs are recovered, 
it will be told to call server startup<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * because by then, its regions have 
probably been reassigned.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private final Map&lt;ServerName, 
Long&gt; deadServers = new HashMap&lt;&gt;();<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>   * Number of dead servers currently 
being processed<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private int numProcessing = 0;<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>   * Whether a dead server is being 
processed currently.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private volatile boolean processing = 
false;<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>   * A dead server that comes back alive 
has a different start code. The new start code should be<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   *  greater than the old one, but we 
don't take this into account in this method.<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   *<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * @param newServerName Servername as 
either &lt;code&gt;host:port&lt;/code&gt; or<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   *                      
&lt;code&gt;host,port,startcode&lt;/code&gt;.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * @return true if this server was dead 
before and coming back alive again<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public synchronized boolean 
cleanPreviousInstance(final ServerName newServerName) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    Iterator&lt;ServerName&gt; it = 
deadServers.keySet().iterator();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    while (it.hasNext()) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>      ServerName sn = it.next();<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>      if (ServerName.isSameAddress(sn, 
newServerName)) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        it.remove();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        return true;<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><a name="line.83"></a>
-<span class="sourceLineNo">084</span>    return false;<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>  /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * @param serverName server name.<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @return true if this server is on 
the dead servers list false otherwise<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public synchronized boolean 
isDeadServer(final ServerName serverName) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    return 
deadServers.containsKey(serverName);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * Checks if there are currently any 
dead servers being processed by the<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * master.  Returns true if at least 
one region server is currently being<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * processed as dead.<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>   *<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @return true if any RS are being 
processed as dead<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public synchronized boolean 
areDeadServersInProgress() { return processing; }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  public synchronized 
Set&lt;ServerName&gt; copyServerNames() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    Set&lt;ServerName&gt; clone = new 
HashSet&lt;&gt;(deadServers.size());<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    clone.addAll(deadServers.keySet());<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    return clone;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * Adds the server to the dead server 
list if it's not there already.<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @param sn the server name<a 
name="line.112"></a>
+<span class="sourceLineNo">028</span>import 
com.google.common.base.Preconditions;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.ArrayList;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.Collections;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.Comparator;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.Date;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.HashMap;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import java.util.HashSet;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.util.Iterator;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.List;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.Map;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.Set;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Class to hold dead servers list and 
utility querying dead server list.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * On znode expiration, servers are added 
here.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>public class DeadServer {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>  private static final Logger LOG = 
LoggerFactory.getLogger(DeadServer.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  /**<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   * Set of known dead servers.  On znode 
expiration, servers are added here.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * This is needed in case of a network 
partitioning where the server's lease<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * expires, but the server is still 
running. After the network is healed,<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * and it's server logs are recovered, 
it will be told to call server startup<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * because by then, its regions have 
probably been reassigned.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  private final Map&lt;ServerName, 
Long&gt; deadServers = new HashMap&lt;&gt;();<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * Set of dead servers currently being 
processed<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private final Set&lt;ServerName&gt; 
processingServers = new HashSet&lt;ServerName&gt;();<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * A dead server that comes back alive 
has a different start code. The new start code should be<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   *  greater than the old one, but we 
don't take this into account in this method.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   *<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @param newServerName Servername as 
either &lt;code&gt;host:port&lt;/code&gt; or<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   *                      
&lt;code&gt;host,port,startcode&lt;/code&gt;.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   * @return true if this server was dead 
before and coming back alive again<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  public synchronized boolean 
cleanPreviousInstance(final ServerName newServerName) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    Iterator&lt;ServerName&gt; it = 
deadServers.keySet().iterator();<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    while (it.hasNext()) {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>      ServerName sn = it.next();<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>      if (ServerName.isSameAddress(sn, 
newServerName)) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        // remove from deadServers<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>        it.remove();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        // remove from 
processingServers<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        boolean removed = 
processingServers.remove(sn);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        if (removed) {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>          LOG.debug("Removed " + sn + " ; 
numProcessing=" + processingServers.size());<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        return true;<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><a name="line.87"></a>
+<span class="sourceLineNo">088</span>    return false;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @param serverName server name.<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>   * @return true if this server is on 
the dead servers list false otherwise<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public synchronized boolean 
isDeadServer(final ServerName serverName) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    return 
deadServers.containsKey(serverName);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @param serverName server name.<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>   * @return true if this server is on 
the processing servers list false otherwise<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public synchronized boolean 
isProcessingServer(final ServerName serverName) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    return 
processingServers.contains(serverName);<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>  /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * Checks if there are currently any 
dead servers being processed by the<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * master.  Returns true if at least 
one region server is currently being<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * processed as dead.<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   *<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * @return true if any RS are being 
processed as dead<a name="line.112"></a>
 <span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  public synchronized void add(ServerName 
sn) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    processing = true;<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    if (!deadServers.containsKey(sn)){<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      deadServers.put(sn, 
EnvironmentEdgeManager.currentTime());<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><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * Notify that we started processing 
this dead server.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @param sn ServerName for the dead 
server.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public synchronized void 
notifyServer(ServerName sn) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (LOG.isTraceEnabled()) { 
LOG.trace("Started processing " + sn); }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    processing = true;<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    numProcessing++;<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>  public synchronized void 
finish(ServerName sn) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    numProcessing--;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    if (LOG.isTraceEnabled()) 
LOG.trace("Finished " + sn + "; numProcessing=" + numProcessing);<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>    assert numProcessing &gt;= 0: "Number 
of dead servers in processing should always be non-negative";<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    if (numProcessing == 0) { processing 
= false; }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public synchronized int size() {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    return deadServers.size();<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>  public synchronized boolean isEmpty() 
{<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    return deadServers.isEmpty();<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>  public synchronized void 
cleanAllPreviousInstances(final ServerName newServerName) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    Iterator&lt;ServerName&gt; it = 
deadServers.keySet().iterator();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    while (it.hasNext()) {<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      ServerName sn = it.next();<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      if (ServerName.isSameAddress(sn, 
newServerName)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>        it.remove();<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>  }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>  @Override<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  public synchronized String toString() 
{<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    StringBuilder sb = new 
StringBuilder();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    for (ServerName sn : 
deadServers.keySet()) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      if (sb.length() &gt; 0) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>        sb.append(", ");<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      sb.append(sn.toString());<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    return sb.toString();<a 
name="line.167"></a>
+<span class="sourceLineNo">114</span>  public synchronized boolean 
areDeadServersInProgress() {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    return 
!processingServers.isEmpty();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  public synchronized 
Set&lt;ServerName&gt; copyServerNames() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    Set&lt;ServerName&gt; clone = new 
HashSet&lt;&gt;(deadServers.size());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    clone.addAll(deadServers.keySet());<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    return clone;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   * Adds the server to the dead server 
list if it's not there already.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @param sn the server name<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>   */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  public synchronized void add(ServerName 
sn) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    if (!deadServers.containsKey(sn)){<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>      deadServers.put(sn, 
EnvironmentEdgeManager.currentTime());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    boolean added = 
processingServers.add(sn);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    if (LOG.isDebugEnabled() &amp;&amp; 
added) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      LOG.debug("Added " + sn + "; 
numProcessing=" + processingServers.size());<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * Notify that we started processing 
this dead server.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   * @param sn ServerName for the dead 
server.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public synchronized void 
notifyServer(ServerName sn) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    boolean added = 
processingServers.add(sn);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    if (LOG.isDebugEnabled()) {<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      if (added) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        LOG.debug("Added " + sn + "; 
numProcessing=" + processingServers.size());<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      LOG.debug("Started processing " + 
sn + "; numProcessing=" + processingServers.size());<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>  /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * Complete processing for this dead 
server.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * @param sn ServerName for the dead 
server.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  public synchronized void 
finish(ServerName sn) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    boolean removed = 
processingServers.remove(sn);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    if (LOG.isDebugEnabled()) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      LOG.debug("Finished processing " + 
sn + "; numProcessing=" + processingServers.size());<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      if (removed) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        LOG.debug("Removed " + sn + " ; 
numProcessing=" + processingServers.size());<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>  }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  public synchronized int size() {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    return deadServers.size();<a 
name="line.167"></a>
 <span class="sourceLineNo">168</span>  }<a name="line.168"></a>
 <span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * Extract all the servers dead since a 
given time, and sort them.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * @param ts the time, 0 for all<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>   * @return a sorted array list, by 
death time, lowest values first.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  public synchronized 
List&lt;Pair&lt;ServerName, Long&gt;&gt; copyDeadServersSince(long ts){<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>    List&lt;Pair&lt;ServerName, 
Long&gt;&gt; res =  new ArrayList&lt;&gt;(size());<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>    for (Map.Entry&lt;ServerName, 
Long&gt; entry:deadServers.entrySet()){<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (entry.getValue() &gt;= ts){<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>        res.add(new 
Pair&lt;&gt;(entry.getKey(), entry.getValue()));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      }<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>    Collections.sort(res, 
ServerNameDeathDateComparator);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    return res;<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>  /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   * Get the time when a server died<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>   * @param deadServerName the dead 
server name<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * @return the date when the server 
died <a name="line.191"></a>
-<span class="sourceLineNo">192</span>   */<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public synchronized Date 
getTimeOfDeath(final ServerName deadServerName){<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    Long time = 
deadServers.get(deadServerName);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    return time == null ? null : new 
Date(time);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>  private static 
Comparator&lt;Pair&lt;ServerName, Long&gt;&gt; ServerNameDeathDateComparator 
=<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      new 
Comparator&lt;Pair&lt;ServerName, Long&gt;&gt;(){<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    public int 
compare(Pair&lt;ServerName, Long&gt; o1, Pair&lt;ServerName, Long&gt; o2) {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      return 
o1.getSecond().compareTo(o2.getSecond());<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  };<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>   * remove the specified dead server<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>   * @param deadServerName the dead 
server name<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * @return true if this server was 
removed<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   */<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public synchronized boolean 
removeDeadServer(final ServerName deadServerName) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    if 
(deadServers.remove(deadServerName) == null) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return false;<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    return true;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>}<a name="line.219"></a>
+<span class="sourceLineNo">170</span>  public synchronized boolean isEmpty() 
{<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    return deadServers.isEmpty();<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>  public synchronized void 
cleanAllPreviousInstances(final ServerName newServerName) {<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>    Iterator&lt;ServerName&gt; it = 
deadServers.keySet().iterator();<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    while (it.hasNext()) {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>      ServerName sn = it.next();<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>      if (ServerName.isSameAddress(sn, 
newServerName)) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        // remove from deadServers<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>        it.remove();<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>        // remove from 
processingServers<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        boolean removed = 
processingServers.remove(sn);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        if (removed) {<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>          LOG.debug("Removed " + sn + " ; 
numProcessing=" + processingServers.size());<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>    }<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>  @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>  public synchronized String toString() 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    // Display unified set of servers 
from both maps<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    Set&lt;ServerName&gt; servers = new 
HashSet&lt;ServerName&gt;();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    
servers.addAll(deadServers.keySet());<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    servers.addAll(processingServers);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>    StringBuilder sb = new 
StringBuilder();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    for (ServerName sn : servers) {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      if (sb.length() &gt; 0) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>        sb.append(", ");<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      sb.append(sn.toString());<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>      // Star entries that are being 
processed<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      if (processingServers.contains(sn)) 
{<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        sb.append("*");<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    return sb.toString();<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * Extract all the servers dead since a 
given time, and sort them.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * @param ts the time, 0 for all<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>   * @return a sorted array list, by 
death time, lowest values first.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>  public synchronized 
List&lt;Pair&lt;ServerName, Long&gt;&gt; copyDeadServersSince(long ts){<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>    List&lt;Pair&lt;ServerName, 
Long&gt;&gt; res =  new ArrayList&lt;&gt;(size());<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    for (Map.Entry&lt;ServerName, 
Long&gt; entry:deadServers.entrySet()){<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      if (entry.getValue() &gt;= ts){<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>        res.add(new 
Pair&lt;&gt;(entry.getKey(), entry.getValue()));<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    Collections.sort(res, 
ServerNameDeathDateComparator);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    return res;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<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>   * Get the time when a server died<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>   * @param deadServerName the dead 
server name<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * @return the date when the server 
died <a name="line.231"></a>
+<span class="sourceLineNo">232</span>   */<a name="line.232"></a>
+<span class="sourceLineNo">233</span>  public synchronized Date 
getTimeOfDeath(final ServerName deadServerName){<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    Long time = 
deadServers.get(deadServerName);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    return time == null ? null : new 
Date(time);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>  private static 
Comparator&lt;Pair&lt;ServerName, Long&gt;&gt; ServerNameDeathDateComparator 
=<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      new 
Comparator&lt;Pair&lt;ServerName, Long&gt;&gt;(){<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>    @Override<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public int 
compare(Pair&lt;ServerName, Long&gt; o1, Pair&lt;ServerName, Long&gt; o2) {<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>      return 
o1.getSecond().compareTo(o2.getSecond());<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    }<a name="line.244"></a>
+<span class="sourceLineNo">245</span>  };<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>  /**<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * remove the specified dead server<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>   * @param deadServerName the dead 
server name<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * @return true if this server was 
removed<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   */<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>  public synchronized boolean 
removeDeadServer(final ServerName deadServerName) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    
Preconditions.checkState(!processingServers.contains(deadServerName),<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      "Asked to remove server still in 
processingServers set " + deadServerName +<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          " (numProcessing=" + 
processingServers.size() + ")");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    if 
(deadServers.remove(deadServerName) == null) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      return false;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    return true;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/323b17d9/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.html
index 1ccb0e1..703da4f 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.html
@@ -148,82 +148,103 @@
 <span class="sourceLineNo">140</span>    return procs;<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>  private static 
TransitRegionStateProcedure[] createAssignProcedures(MasterProcedureEnv env,<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      List&lt;RegionInfo&gt; regions, int 
regionReplication, ServerName targetServer) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // create the assign procs only for 
the primary region using the targetServer<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    TransitRegionStateProcedure[] 
primaryRegionProcs = regions.stream()<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        
.map(env.getAssignmentManager().getRegionStates()::getOrCreateRegionStateNode)<a
 name="line.147"></a>
-<span class="sourceLineNo">148</span>        .map(regionNode -&gt; {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>          TransitRegionStateProcedure 
proc =<a name="line.149"></a>
-<span class="sourceLineNo">150</span>              
TransitRegionStateProcedure.assign(env, regionNode.getRegionInfo(), 
targetServer);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>          regionNode.lock();<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>          try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>            // should never fail, as we 
have the exclusive region lock, and the region is newly<a name="line.153"></a>
-<span class="sourceLineNo">154</span>            // created, or has been 
successfully closed so should not be on any servers, so SCP will<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>            // not process it either.<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>            assert 
!regionNode.isInTransition();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>            
regionNode.setProcedure(proc);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          } finally {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>            regionNode.unlock();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>          }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>          return proc;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>        
}).toArray(TransitRegionStateProcedure[]::new);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    if (regionReplication == 
DEFAULT_REGION_REPLICA) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      // this is the default case<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>      return primaryRegionProcs;<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    // collect the replica region infos<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    List&lt;RegionInfo&gt; 
replicaRegionInfos =<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        new 
ArrayList&lt;RegionInfo&gt;(regions.size() * (regionReplication - 1));<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>    for (RegionInfo hri : regions) {<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      // start the index from 1<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      for (int i = 1; i &lt; 
regionReplication; i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        
replicaRegionInfos.add(RegionReplicaUtil.getRegionInfoForReplica(hri, i));<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    // create round robin procs. Note 
that we exclude the primary region's target server<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    TransitRegionStateProcedure[] 
replicaRegionAssignProcs =<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        
env.getAssignmentManager().createRoundRobinAssignProcedures(replicaRegionInfos,<a
 name="line.178"></a>
-<span class="sourceLineNo">179</span>          
Collections.singletonList(targetServer));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    // combine both the procs and return 
the result<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    return 
ArrayUtils.addAll(primaryRegionProcs, replicaRegionAssignProcs);<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>  static TransitRegionStateProcedure[] 
createAssignProceduresForOpeningNewRegions(<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      MasterProcedureEnv env, 
List&lt;RegionInfo&gt; regions, int regionReplication,<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      ServerName targetServer) {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    return createAssignProcedures(env, 
regions, regionReplication, targetServer);<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>  static void 
reopenRegionsForRollback(MasterProcedureEnv env, List&lt;RegionInfo&gt; 
regions,<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      int regionReplication, ServerName 
targetServer) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    TransitRegionStateProcedure[] procs 
=<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        createAssignProcedures(env, 
regions, regionReplication, targetServer);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    
env.getMasterServices().getMasterProcedureExecutor().submitProcedures(procs);<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  static void 
removeNonDefaultReplicas(MasterProcedureEnv env, Stream&lt;RegionInfo&gt; 
regions,<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      int regionReplication) {<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>    // Remove from in-memory states<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    regions.flatMap(hri -&gt; 
IntStream.range(1, regionReplication)<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      .mapToObj(i -&gt; 
RegionReplicaUtil.getRegionInfoForReplica(hri, i))).forEach(hri -&gt; {<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>        
env.getAssignmentManager().getRegionStates().deleteRegion(hri);<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>        
env.getMasterServices().getServerManager().removeRegion(hri);<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>        FavoredNodesManager fnm = 
env.getMasterServices().getFavoredNodesManager();<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        if (fnm != null) {<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>          
fnm.deleteFavoredNodesForRegions(Collections.singletonList(hri));<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>        }<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      });<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  static void 
checkClosedRegion(MasterProcedureEnv env, RegionInfo regionInfo) throws 
IOException {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    if 
(WALSplitter.hasRecoveredEdits(env.getMasterServices().getFileSystem(),<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      env.getMasterConfiguration(), 
regionInfo)) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      throw new 
IOException("Recovered.edits are found in Region: " + regionInfo +<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        ", abort split/merge to prevent 
data loss");<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>}<a name="line.218"></a>
+<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * Create assign procedures for the 
give regions, according to the {@code regionReplication}.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   * &lt;p/&gt;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * For rolling back, we will submit 
procedures directly to the {@code ProcedureExecutor}, so it is<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>   * possible that we persist the newly 
scheduled procedures, and then crash before persisting the<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>   * rollback state, so when we arrive 
here the second time, it is possible that some regions have<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>   * already been associated with a 
TRSP.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * @param ignoreIfInTransition if true, 
will skip creating TRSP for the given region if it is<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   *          already in transition, 
otherwise we will add an assert that it should not in<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   *          transition.<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>   */<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  private static 
TransitRegionStateProcedure[] createAssignProcedures(MasterProcedureEnv env,<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      List&lt;RegionInfo&gt; regions, int 
regionReplication, ServerName targetServer,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      boolean ignoreIfInTransition) {<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    // create the assign procs only for 
the primary region using the targetServer<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    TransitRegionStateProcedure[] 
primaryRegionProcs =<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      
regions.stream().map(env.getAssignmentManager().getRegionStates()::getOrCreateRegionStateNode)<a
 name="line.159"></a>
+<span class="sourceLineNo">160</span>        .map(regionNode -&gt; {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>          TransitRegionStateProcedure 
proc =<a name="line.161"></a>
+<span class="sourceLineNo">162</span>            
TransitRegionStateProcedure.assign(env, regionNode.getRegionInfo(), 
targetServer);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          regionNode.lock();<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>          try {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            if (ignoreIfInTransition) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>              if 
(regionNode.isInTransition()) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>                return null;<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>              }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            } else {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>              // should never fail, as we 
have the exclusive region lock, and the region is newly<a name="line.170"></a>
+<span class="sourceLineNo">171</span>              // created, or has been 
successfully closed so should not be on any servers, so SCP<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>              // will<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>              // not process it either.<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>              assert 
!regionNode.isInTransition();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>            }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            
regionNode.setProcedure(proc);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          } finally {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>            regionNode.unlock();<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>          }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          return proc;<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>        }).filter(p -&gt; p != 
null).toArray(TransitRegionStateProcedure[]::new);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    if (regionReplication == 
DEFAULT_REGION_REPLICA) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      // this is the default case<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>      return primaryRegionProcs;<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    // collect the replica region infos<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>    List&lt;RegionInfo&gt; 
replicaRegionInfos =<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        new 
ArrayList&lt;RegionInfo&gt;(regions.size() * (regionReplication - 1));<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>    for (RegionInfo hri : regions) {<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>      // start the index from 1<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      for (int i = 1; i &lt; 
regionReplication; i++) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        
replicaRegionInfos.add(RegionReplicaUtil.getRegionInfoForReplica(hri, i));<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>    // create round robin procs. Note 
that we exclude the primary region's target server<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    TransitRegionStateProcedure[] 
replicaRegionAssignProcs =<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        
env.getAssignmentManager().createRoundRobinAssignProcedures(replicaRegionInfos,<a
 name="line.197"></a>
+<span class="sourceLineNo">198</span>          
Collections.singletonList(targetServer));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    // combine both the procs and return 
the result<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    return 
ArrayUtils.addAll(primaryRegionProcs, replicaRegionAssignProcs);<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>  static TransitRegionStateProcedure[] 
createAssignProceduresForOpeningNewRegions(<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      MasterProcedureEnv env, 
List&lt;RegionInfo&gt; regions, int regionReplication,<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      ServerName targetServer) {<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    return createAssignProcedures(env, 
regions, regionReplication, targetServer, false);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>  static void 
reopenRegionsForRollback(MasterProcedureEnv env, List&lt;RegionInfo&gt; 
regions,<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      int regionReplication, ServerName 
targetServer) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    TransitRegionStateProcedure[] procs 
=<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        createAssignProcedures(env, 
regions, regionReplication, targetServer, true);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    if (procs.length &gt; 0) {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>      
env.getMasterServices().getMasterProcedureExecutor().submitProcedures(procs);<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><a name="line.217"></a>
+<span class="sourceLineNo">218</span>  static void 
removeNonDefaultReplicas(MasterProcedureEnv env, Stream&lt;RegionInfo&gt; 
regions,<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      int regionReplication) {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    // Remove from in-memory states<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    regions.flatMap(hri -&gt; 
IntStream.range(1, regionReplication)<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      .mapToObj(i -&gt; 
RegionReplicaUtil.getRegionInfoForReplica(hri, i))).forEach(hri -&gt; {<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>        
env.getAssignmentManager().getRegionStates().deleteRegion(hri);<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>        
env.getMasterServices().getServerManager().removeRegion(hri);<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>        FavoredNodesManager fnm = 
env.getMasterServices().getFavoredNodesManager();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        if (fnm != null) {<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>          
fnm.deleteFavoredNodesForRegions(Collections.singletonList(hri));<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>  }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>  static void 
checkClosedRegion(MasterProcedureEnv env, RegionInfo regionInfo) throws 
IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    if 
(WALSplitter.hasRecoveredEdits(env.getMasterServices().getFileSystem(),<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>      env.getMasterConfiguration(), 
regionInfo)) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      throw new 
IOException("Recovered.edits are found in Region: " + regionInfo +<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>        ", abort split/merge to prevent 
data loss");<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>}<a name="line.239"></a>
 
 
 

Reply via email to