http://git-wip-us.apache.org/repos/asf/hbase-site/blob/65565d77/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterMetaBootstrap.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterMetaBootstrap.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterMetaBootstrap.html
index e73540e..7b680e9 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterMetaBootstrap.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterMetaBootstrap.html
@@ -28,135 +28,100 @@
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.List;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.Set;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.client.RegionInfo;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.zookeeper.KeeperException;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.slf4j.Logger;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.LoggerFactory;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Used by the HMaster on startup to 
split meta logs and assign the meta table.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>public class MasterMetaBootstrap {<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>  private static final Logger LOG = 
LoggerFactory.getLogger(MasterMetaBootstrap.class);<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private final HMaster master;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  public MasterMetaBootstrap(HMaster 
master) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    this.master = master;<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>  public void recoverMeta() throws 
InterruptedException, IOException {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    // This is a blocking call that waits 
until hbase:meta is deployed.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    master.recoverMeta();<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    // Now we can start the 
TableStateManager. It is backed by hbase:meta.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    
master.getTableStateManager().start();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    // Enable server crash procedure 
handling<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    enableCrashedServerProcessing();<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>  public void processDeadServers() {<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    // get a list for previously failed 
RS which need log splitting work<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    // we recover hbase:meta region 
servers inside master initialization and<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    // handle other failed servers in SSH 
in order to start up master node ASAP<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    Set&lt;ServerName&gt; 
previouslyFailedServers =<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        
master.getMasterWalManager().getFailedServersFromLogFolders();<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>    // Master has recovered hbase:meta 
region server and we put<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    // other failed region servers in a 
queue to be handled later by SSH<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    for (ServerName tmpServer : 
previouslyFailedServers) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      
master.getServerManager().processDeadServer(tmpServer, true);<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * For assigning hbase:meta replicas 
only.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * TODO: The way this assign runs, 
nothing but chance to stop all replicas showing up on same<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * server as the hbase:meta region.<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>   */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected void assignMetaReplicas()<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>      throws IOException, 
InterruptedException, KeeperException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    int numReplicas = 
master.getConfiguration().getInt(HConstants.META_REPLICAS_NUM,<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>           
HConstants.DEFAULT_META_REPLICA_NUM);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    if (numReplicas &lt;= 1) {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      // No replicaas to assign. 
Return.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      return;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    final AssignmentManager 
assignmentManager = master.getAssignmentManager();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    if 
(!assignmentManager.isMetaInitialized()) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      throw new 
IllegalStateException("hbase:meta must be initialized first before we can " +<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>          "assign out its replicas");<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    ServerName metaServername =<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>        
this.master.getMetaTableLocator().getMetaRegionLocation(this.master.getZooKeeper());<a
 name="line.93"></a>
-<span class="sourceLineNo">094</span>    for (int i = 1; i &lt; numReplicas; 
i++) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      // Get current meta state for 
replica from zk.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      RegionState metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper(), i);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>      RegionInfo hri = 
RegionReplicaUtil.getRegionInfoForReplica(<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          
RegionInfoBuilder.FIRST_META_REGIONINFO, i);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      
LOG.debug(hri.getRegionNameAsString() + " replica region state from zookeeper=" 
+ metaState);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      if 
(metaServername.equals(metaState.getServerName())) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        metaState = null;<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>        
LOG.info(hri.getRegionNameAsString() +<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          " old location is same as 
current hbase:meta location; setting location as null...");<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>      }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      // These assigns run inline. All is 
blocked till they complete. Only interrupt is shutting<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      // down hosting server which calls 
AM#stop.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      if (metaState != null &amp;&amp; 
metaState.getServerName() != null) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        // Try to retain old 
assignment.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        assignmentManager.assign(hri, 
metaState.getServerName());<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        assignmentManager.assign(hri);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>      }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    
unassignExcessMetaReplica(numReplicas);<a name="line.114"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.client.RegionInfo;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.zookeeper.KeeperException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>/**<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Used by the HMaster on startup to 
split meta logs and assign the meta table.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>class MasterMetaBootstrap {<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>  private static final Logger LOG = 
LoggerFactory.getLogger(MasterMetaBootstrap.class);<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  private final HMaster master;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public MasterMetaBootstrap(HMaster 
master) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    this.master = master;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  /**<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   * For assigning hbase:meta replicas 
only.<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * TODO: The way this assign runs, 
nothing but chance to stop all replicas showing up on same<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * server as the hbase:meta region.<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  void assignMetaReplicas()<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>      throws IOException, 
InterruptedException, KeeperException {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    int numReplicas = 
master.getConfiguration().getInt(HConstants.META_REPLICAS_NUM,<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>           
HConstants.DEFAULT_META_REPLICA_NUM);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    if (numReplicas &lt;= 1) {<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      // No replicaas to assign. 
Return.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      return;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    }<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    final AssignmentManager 
assignmentManager = master.getAssignmentManager();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    if 
(!assignmentManager.isMetaLoaded()) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      throw new 
IllegalStateException("hbase:meta must be initialized first before we can " +<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>          "assign out its replicas");<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    ServerName metaServername =<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>        
this.master.getMetaTableLocator().getMetaRegionLocation(this.master.getZooKeeper());<a
 name="line.69"></a>
+<span class="sourceLineNo">070</span>    for (int i = 1; i &lt; numReplicas; 
i++) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      // Get current meta state for 
replica from zk.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      RegionState metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper(), i);<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>      RegionInfo hri = 
RegionReplicaUtil.getRegionInfoForReplica(<a name="line.73"></a>
+<span class="sourceLineNo">074</span>          
RegionInfoBuilder.FIRST_META_REGIONINFO, i);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      
LOG.debug(hri.getRegionNameAsString() + " replica region state from zookeeper=" 
+ metaState);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      if 
(metaServername.equals(metaState.getServerName())) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        metaState = null;<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>        
LOG.info(hri.getRegionNameAsString() +<a name="line.78"></a>
+<span class="sourceLineNo">079</span>          " old location is same as 
current hbase:meta location; setting location as null...");<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      }<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // These assigns run inline. All is 
blocked till they complete. Only interrupt is shutting<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      // down hosting server which calls 
AM#stop.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      if (metaState != null &amp;&amp; 
metaState.getServerName() != null) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        // Try to retain old 
assignment.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        assignmentManager.assign(hri, 
metaState.getServerName());<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      } else {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        assignmentManager.assign(hri);<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>    
unassignExcessMetaReplica(numReplicas);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  private void 
unassignExcessMetaReplica(int numMetaReplicasConfigured) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    final ZKWatcher zooKeeper = 
master.getZooKeeper();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    // unassign the unneeded replicas 
(for e.g., if the previous master was configured<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    // with a replication of 3 and now it 
is 2, we need to unassign the 1 unneeded replica)<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      List&lt;String&gt; 
metaReplicaZnodes = zooKeeper.getMetaReplicaNodes();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      for (String metaReplicaZnode : 
metaReplicaZnodes) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        int replicaId = 
zooKeeper.getZNodePaths().getMetaReplicaIdFromZnode(metaReplicaZnode);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        if (replicaId &gt;= 
numMetaReplicasConfigured) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          RegionState r = 
MetaTableLocator.getMetaRegionState(zooKeeper, replicaId);<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>          LOG.info("Closing excess 
replica of meta region " + r.getRegion());<a name="line.103"></a>
+<span class="sourceLineNo">104</span>          // send a close and wait for a 
max of 30 seconds<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          
ServerManager.closeRegionSilentlyAndWait(master.getClusterConnection(),<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>              r.getServerName(), 
r.getRegion(), 30000);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          ZKUtil.deleteNode(zooKeeper, 
zooKeeper.getZNodePaths().getZNodeForReplica(replicaId));<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>    } catch (Exception ex) {<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      // ignore the exception since we 
don't want the master to be wedged due to potential<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      // issues in the cleanup of the 
extra regions. We can do that cleanup via hbck or manually<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      LOG.warn("Ignoring exception " + 
ex);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
 <span class="sourceLineNo">115</span>  }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  private void 
unassignExcessMetaReplica(int numMetaReplicasConfigured) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    final ZKWatcher zooKeeper = 
master.getZooKeeper();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // unassign the unneeded replicas 
(for e.g., if the previous master was configured<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    // with a replication of 3 and now it 
is 2, we need to unassign the 1 unneeded replica)<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    try {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      List&lt;String&gt; 
metaReplicaZnodes = zooKeeper.getMetaReplicaNodes();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      for (String metaReplicaZnode : 
metaReplicaZnodes) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        int replicaId = 
zooKeeper.getZNodePaths().getMetaReplicaIdFromZnode(metaReplicaZnode);<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>        if (replicaId &gt;= 
numMetaReplicasConfigured) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>          RegionState r = 
MetaTableLocator.getMetaRegionState(zooKeeper, replicaId);<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>          LOG.info("Closing excess 
replica of meta region " + r.getRegion());<a name="line.127"></a>
-<span class="sourceLineNo">128</span>          // send a close and wait for a 
max of 30 seconds<a name="line.128"></a>
-<span class="sourceLineNo">129</span>          
ServerManager.closeRegionSilentlyAndWait(master.getClusterConnection(),<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>              r.getServerName(), 
r.getRegion(), 30000);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>          ZKUtil.deleteNode(zooKeeper, 
zooKeeper.getZNodePaths().getZNodeForReplica(replicaId));<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    } catch (Exception ex) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>      // ignore the exception since we 
don't want the master to be wedged due to potential<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      // issues in the cleanup of the 
extra regions. We can do that cleanup via hbck or manually<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      LOG.warn("Ignoring exception " + 
ex);<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><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private void 
enableCrashedServerProcessing() throws InterruptedException {<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>    // If crashed server processing is 
disabled, we enable it and expire those dead but not expired<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    // servers. This is required so that 
if meta is assigning to a server which dies after<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    // assignMeta starts assignment, 
ServerCrashProcedure can re-assign it. Otherwise, we will be<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    // stuck here waiting forever if 
waitForMeta is specified.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    if 
(!master.isServerCrashProcessingEnabled()) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      
master.setServerCrashProcessingEnabled(true);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      
master.getServerManager().processQueuedDeadServers();<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">116</span>}<a name="line.116"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/65565d77/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html
index 23d8d73..76cc763 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterServices.html
@@ -329,193 +329,181 @@
 <span class="sourceLineNo">321</span>  TableDescriptors 
getTableDescriptors();<a name="line.321"></a>
 <span class="sourceLineNo">322</span><a name="line.322"></a>
 <span class="sourceLineNo">323</span>  /**<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   * @return true if master enables 
ServerShutdownHandler;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   */<a name="line.325"></a>
-<span class="sourceLineNo">326</span>  boolean 
isServerCrashProcessingEnabled();<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * Registers a new protocol buffer 
{@link Service} subclass as a master coprocessor endpoint.<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>   *<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   * &lt;p&gt;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * Only a single instance may be 
registered for a given {@link Service} subclass (the<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   * instances are keyed on {@link 
com.google.protobuf.Descriptors.ServiceDescriptor#getFullName()}.<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>   * After the first registration, 
subsequent calls with the same service name will fail with<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>   * a return value of {@code false}.<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>   * &lt;/p&gt;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   * @param instance the {@code Service} 
subclass instance to expose as a coprocessor endpoint<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   * @return {@code true} if the 
registration was successful, {@code false}<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   * otherwise<a name="line.339"></a>
+<span class="sourceLineNo">324</span>   * Registers a new protocol buffer 
{@link Service} subclass as a master coprocessor endpoint.<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>   *<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   * &lt;p&gt;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   * Only a single instance may be 
registered for a given {@link Service} subclass (the<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * instances are keyed on {@link 
com.google.protobuf.Descriptors.ServiceDescriptor#getFullName()}.<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>   * After the first registration, 
subsequent calls with the same service name will fail with<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>   * a return value of {@code false}.<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>   * &lt;/p&gt;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   * @param instance the {@code Service} 
subclass instance to expose as a coprocessor endpoint<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @return {@code true} if the 
registration was successful, {@code false}<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * otherwise<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>  boolean registerService(Service 
instance);<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>   * @return true if master is the active 
one<a name="line.339"></a>
 <span class="sourceLineNo">340</span>   */<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  boolean registerService(Service 
instance);<a name="line.341"></a>
+<span class="sourceLineNo">341</span>  boolean isActiveMaster();<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>   * @return true if master is the active 
one<a name="line.344"></a>
+<span class="sourceLineNo">344</span>   * @return true if master is 
initialized<a name="line.344"></a>
 <span class="sourceLineNo">345</span>   */<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  boolean isActiveMaster();<a 
name="line.346"></a>
+<span class="sourceLineNo">346</span>  boolean isInitialized();<a 
name="line.346"></a>
 <span class="sourceLineNo">347</span><a name="line.347"></a>
 <span class="sourceLineNo">348</span>  /**<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   * @return true if master is 
initialized<a name="line.349"></a>
-<span class="sourceLineNo">350</span>   */<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  boolean isInitialized();<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>   * @return true if master is in 
maintanceMode<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * @throws IOException if the inquiry 
failed due to an IO problem<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>  boolean isInMaintenanceMode() throws 
IOException;<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>   * Abort a procedure.<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>   * @param procId ID of the procedure<a 
name="line.361"></a>
-<span class="sourceLineNo">362</span>   * @param mayInterruptIfRunning if the 
proc completed at least one step, should it be aborted?<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * @return true if aborted, false if 
procedure already completed or does not exist<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * @throws IOException<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>   */<a name="line.365"></a>
-<span class="sourceLineNo">366</span>  public boolean abortProcedure(final 
long procId, final boolean mayInterruptIfRunning)<a name="line.366"></a>
-<span class="sourceLineNo">367</span>      throws IOException;<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>  /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span>   * Get procedures<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   * @return procedure list<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>   * @throws IOException<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>   */<a name="line.373"></a>
-<span class="sourceLineNo">374</span>  public List&lt;Procedure&lt;?&gt;&gt; 
getProcedures() throws IOException;<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>  /**<a name="line.376"></a>
-<span class="sourceLineNo">377</span>   * Get locks<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * @return lock list<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>   * @throws IOException<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  public List&lt;LockedResource&gt; 
getLocks() throws IOException;<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  /**<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * Get list of table descriptors by 
namespace<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * @param name namespace name<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @return descriptors<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @throws IOException<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>   */<a name="line.388"></a>
-<span class="sourceLineNo">389</span>  public List&lt;TableDescriptor&gt; 
listTableDescriptorsByNamespace(String name) throws IOException;<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>  /**<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   * Get list of table names by 
namespace<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * @param name namespace name<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>   * @return table names<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>   * @throws IOException<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>   */<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  public List&lt;TableName&gt; 
listTableNamesByNamespace(String name) throws IOException;<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>   * @param table the table for which 
last successful major compaction time is queried<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * @return the timestamp of the last 
successful major compaction for the passed table,<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   * or 0 if no HFile resulting from a 
major compaction exists<a name="line.402"></a>
-<span class="sourceLineNo">403</span>   * @throws IOException<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>   */<a name="line.404"></a>
-<span class="sourceLineNo">405</span>  public long 
getLastMajorCompactionTimestamp(TableName table) throws IOException;<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>   * @param regionName<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>   * @return the timestamp of the last 
successful major compaction for the passed region<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * or 0 if no HFile resulting from a 
major compaction exists<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   * @throws IOException<a 
name="line.411"></a>
+<span class="sourceLineNo">349</span>   * @return true if master is in 
maintanceMode<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   * @throws IOException if the inquiry 
failed due to an IO problem<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   */<a name="line.351"></a>
+<span class="sourceLineNo">352</span>  boolean isInMaintenanceMode() throws 
IOException;<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>   * Abort a procedure.<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>   * @param procId ID of the procedure<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>   * @param mayInterruptIfRunning if the 
proc completed at least one step, should it be aborted?<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * @return true if aborted, false if 
procedure already completed or does not exist<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * @throws IOException<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>   */<a name="line.360"></a>
+<span class="sourceLineNo">361</span>  public boolean abortProcedure(final 
long procId, final boolean mayInterruptIfRunning)<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      throws IOException;<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>  /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * Get procedures<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @return procedure list<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>   * @throws IOException<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>   */<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  public List&lt;Procedure&lt;?&gt;&gt; 
getProcedures() throws IOException;<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>   * Get locks<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * @return lock list<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>   * @throws IOException<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>   */<a name="line.375"></a>
+<span class="sourceLineNo">376</span>  public List&lt;LockedResource&gt; 
getLocks() throws IOException;<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   * Get list of table descriptors by 
namespace<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * @param name namespace name<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @return descriptors<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @throws IOException<a 
name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public List&lt;TableDescriptor&gt; 
listTableDescriptorsByNamespace(String name) throws IOException;<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * Get list of table names by 
namespace<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * @param name namespace name<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>   * @return table names<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @throws IOException<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
+<span class="sourceLineNo">392</span>  public List&lt;TableName&gt; 
listTableNamesByNamespace(String name) throws IOException;<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span>  /**<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * @param table the table for which 
last successful major compaction time is queried<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * @return the timestamp of the last 
successful major compaction for the passed table,<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * or 0 if no HFile resulting from a 
major compaction exists<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * @throws IOException<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>   */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>  public long 
getLastMajorCompactionTimestamp(TableName table) throws IOException;<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>  /**<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * @param regionName<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>   * @return the timestamp of the last 
successful major compaction for the passed region<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   * or 0 if no HFile resulting from a 
major compaction exists<a name="line.405"></a>
+<span class="sourceLineNo">406</span>   * @throws IOException<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>   */<a name="line.407"></a>
+<span class="sourceLineNo">408</span>  public long 
getLastMajorCompactionTimestampForRegion(byte[] regionName) throws 
IOException;<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>  /**<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * @return load balancer<a 
name="line.411"></a>
 <span class="sourceLineNo">412</span>   */<a name="line.412"></a>
-<span class="sourceLineNo">413</span>  public long 
getLastMajorCompactionTimestampForRegion(byte[] regionName) throws 
IOException;<a name="line.413"></a>
+<span class="sourceLineNo">413</span>  public LoadBalancer 
getLoadBalancer();<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>   * @return load balancer<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>   */<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  public LoadBalancer 
getLoadBalancer();<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>  boolean 
isSplitOrMergeEnabled(MasterSwitchType switchType);<a name="line.420"></a>
+<span class="sourceLineNo">415</span>  boolean 
isSplitOrMergeEnabled(MasterSwitchType switchType);<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>  /**<a name="line.417"></a>
+<span class="sourceLineNo">418</span>   * @return Favored Nodes Manager<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>   */<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  public FavoredNodesManager 
getFavoredNodesManager();<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>   * @return Favored Nodes Manager<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>   */<a name="line.424"></a>
-<span class="sourceLineNo">425</span>  public FavoredNodesManager 
getFavoredNodesManager();<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>  /**<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   * Add a new replication peer for 
replicating data to slave cluster<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   * @param peerId a short name that 
identifies the peer<a name="line.429"></a>
-<span class="sourceLineNo">430</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.430"></a>
-<span class="sourceLineNo">431</span>   * @param enabled peer state, true if 
ENABLED and false if DISABLED<a name="line.431"></a>
-<span class="sourceLineNo">432</span>   */<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  long addReplicationPeer(String peerId, 
ReplicationPeerConfig peerConfig, boolean enabled)<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      throws ReplicationException, 
IOException;<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>   * Removes a peer and stops the 
replication<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * @param peerId a short name that 
identifies the peer<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   */<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  long removeReplicationPeer(String 
peerId) throws ReplicationException, IOException;<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>  /**<a name="line.442"></a>
-<span class="sourceLineNo">443</span>   * Restart the replication stream to 
the specified peer<a name="line.443"></a>
-<span class="sourceLineNo">444</span>   * @param peerId a short name that 
identifies the peer<a name="line.444"></a>
-<span class="sourceLineNo">445</span>   */<a name="line.445"></a>
-<span class="sourceLineNo">446</span>  long enableReplicationPeer(String 
peerId) throws ReplicationException, IOException;<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   * Stop the replication stream to the 
specified peer<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   * @param peerId a short name that 
identifies the peer<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   */<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  long disableReplicationPeer(String 
peerId) throws ReplicationException, IOException;<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>   * Returns the configured 
ReplicationPeerConfig for the specified peer<a name="line.455"></a>
-<span class="sourceLineNo">456</span>   * @param peerId a short name that 
identifies the peer<a name="line.456"></a>
-<span class="sourceLineNo">457</span>   * @return ReplicationPeerConfig for 
the peer<a name="line.457"></a>
-<span class="sourceLineNo">458</span>   */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>  ReplicationPeerConfig 
getReplicationPeerConfig(String peerId) throws ReplicationException,<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>      IOException;<a name="line.460"></a>
+<span class="sourceLineNo">423</span>   * Add a new replication peer for 
replicating data to slave cluster<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   * @param peerId a short name that 
identifies the peer<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   * @param enabled peer state, true if 
ENABLED and false if DISABLED<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   */<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  long addReplicationPeer(String peerId, 
ReplicationPeerConfig peerConfig, boolean enabled)<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      throws ReplicationException, 
IOException;<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>  /**<a name="line.431"></a>
+<span class="sourceLineNo">432</span>   * Removes a peer and stops the 
replication<a name="line.432"></a>
+<span class="sourceLineNo">433</span>   * @param peerId a short name that 
identifies the peer<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   */<a name="line.434"></a>
+<span class="sourceLineNo">435</span>  long removeReplicationPeer(String 
peerId) throws ReplicationException, IOException;<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>  /**<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * Restart the replication stream to 
the specified peer<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * @param peerId a short name that 
identifies the peer<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   */<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  long enableReplicationPeer(String 
peerId) throws ReplicationException, IOException;<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  /**<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   * Stop the replication stream to the 
specified peer<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   * @param peerId a short name that 
identifies the peer<a name="line.445"></a>
+<span class="sourceLineNo">446</span>   */<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  long disableReplicationPeer(String 
peerId) throws ReplicationException, IOException;<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>  /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * Returns the configured 
ReplicationPeerConfig for the specified peer<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * @param peerId a short name that 
identifies the peer<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   * @return ReplicationPeerConfig for 
the peer<a name="line.452"></a>
+<span class="sourceLineNo">453</span>   */<a name="line.453"></a>
+<span class="sourceLineNo">454</span>  ReplicationPeerConfig 
getReplicationPeerConfig(String peerId) throws ReplicationException,<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>      IOException;<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>  /**<a name="line.457"></a>
+<span class="sourceLineNo">458</span>   * Returns the {@link 
ReplicationPeerManager}.<a name="line.458"></a>
+<span class="sourceLineNo">459</span>   */<a name="line.459"></a>
+<span class="sourceLineNo">460</span>  ReplicationPeerManager 
getReplicationPeerManager();<a name="line.460"></a>
 <span class="sourceLineNo">461</span><a name="line.461"></a>
 <span class="sourceLineNo">462</span>  /**<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * Returns the {@link 
ReplicationPeerManager}.<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   */<a name="line.464"></a>
-<span class="sourceLineNo">465</span>  ReplicationPeerManager 
getReplicationPeerManager();<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  /**<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * Update the peerConfig for the 
specified peer<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * @param peerId a short name that 
identifies the peer<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * @param peerConfig new config for the 
peer<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>  long updateReplicationPeerConfig(String 
peerId, ReplicationPeerConfig peerConfig)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      throws ReplicationException, 
IOException;<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>   * Return a list of replication 
peers.<a name="line.476"></a>
-<span class="sourceLineNo">477</span>   * @param regex The regular expression 
to match peer id<a name="line.477"></a>
-<span class="sourceLineNo">478</span>   * @return a list of replication peers 
description<a name="line.478"></a>
-<span class="sourceLineNo">479</span>   */<a name="line.479"></a>
-<span class="sourceLineNo">480</span>  List&lt;ReplicationPeerDescription&gt; 
listReplicationPeers(String regex) throws ReplicationException,<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>      IOException;<a name="line.481"></a>
+<span class="sourceLineNo">463</span>   * Update the peerConfig for the 
specified peer<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param peerId a short name that 
identifies the peer<a name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @param peerConfig new config for the 
peer<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   */<a name="line.466"></a>
+<span class="sourceLineNo">467</span>  long updateReplicationPeerConfig(String 
peerId, ReplicationPeerConfig peerConfig)<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      throws ReplicationException, 
IOException;<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>  /**<a name="line.470"></a>
+<span class="sourceLineNo">471</span>   * Return a list of replication 
peers.<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * @param regex The regular expression 
to match peer id<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * @return a list of replication peers 
description<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
+<span class="sourceLineNo">475</span>  List&lt;ReplicationPeerDescription&gt; 
listReplicationPeers(String regex) throws ReplicationException,<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>      IOException;<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>  /**<a name="line.478"></a>
+<span class="sourceLineNo">479</span>   * @return {@link LockManager} to lock 
namespaces/tables/regions.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   */<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  LockManager getLockManager();<a 
name="line.481"></a>
 <span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span>   * @return {@link LockManager} to lock 
namespaces/tables/regions.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   */<a name="line.485"></a>
-<span class="sourceLineNo">486</span>  LockManager getLockManager();<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>  public String 
getRegionServerVersion(final ServerName sn);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>  /**<a name="line.490"></a>
-<span class="sourceLineNo">491</span>   * Called when a new RegionServer is 
added to the cluster.<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   * Checks if new server has a newer 
version than any existing server and will move system tables<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>   * there if so.<a name="line.493"></a>
-<span class="sourceLineNo">494</span>   */<a name="line.494"></a>
-<span class="sourceLineNo">495</span>  public void 
checkIfShouldMoveSystemRegionAsync();<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span>  /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   * Recover meta table. Will result in 
no-op is meta is already initialized. Any code that has<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   * access to master and requires to 
access meta during process initialization can call this<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   * method to make sure meta is 
initialized.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>   */<a name="line.501"></a>
-<span class="sourceLineNo">502</span>  boolean recoverMeta() throws 
IOException;<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>  String getClientIdAuditPrefix();<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>  /**<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   * @return True if cluster is up; false 
if cluster is not up (we are shutting down).<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   */<a name="line.508"></a>
-<span class="sourceLineNo">509</span>  boolean isClusterUp();<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>}<a name="line.510"></a>
+<span class="sourceLineNo">483</span>  public String 
getRegionServerVersion(final ServerName sn);<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span>  /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span>   * Called when a new RegionServer is 
added to the cluster.<a name="line.486"></a>
+<span class="sourceLineNo">487</span>   * Checks if new server has a newer 
version than any existing server and will move system tables<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>   * there if so.<a name="line.488"></a>
+<span class="sourceLineNo">489</span>   */<a name="line.489"></a>
+<span class="sourceLineNo">490</span>  public void 
checkIfShouldMoveSystemRegionAsync();<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>  String getClientIdAuditPrefix();<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>   * @return True if cluster is up; false 
if cluster is not up (we are shutting down).<a name="line.495"></a>
+<span class="sourceLineNo">496</span>   */<a name="line.496"></a>
+<span class="sourceLineNo">497</span>  boolean isClusterUp();<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>}<a name="line.498"></a>
 
 
 

Reply via email to