http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96e5e102/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html
----------------------------------------------------------------------
diff --git
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html
index 387384f..52df872 100644
---
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html
+++
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html
@@ -31,179 +31,185 @@
<span class="sourceLineNo">023</span>import java.io.IOException;<a
name="line.23"></a>
<span class="sourceLineNo">024</span><a name="line.24"></a>
<span class="sourceLineNo">025</span>import
org.apache.hadoop.conf.Configuration;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.HConstants;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.LocalHBaseCluster;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.ServerName;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;<a
name="line.31"></a>
-<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.master.LoadBalancer;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.master.ServerManager;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a
name="line.36"></a>
-<span class="sourceLineNo">037</span>import
org.apache.zookeeper.KeeperException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.After;<a
name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.Before;<a
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.Test;<a
name="line.40"></a>
-<span class="sourceLineNo">041</span>import
org.junit.experimental.categories.Category;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a
name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>@Category(MediumTests.class)<a
name="line.45"></a>
-<span class="sourceLineNo">046</span>public class
TestRegionServerReportForDuty {<a name="line.46"></a>
+<span class="sourceLineNo">026</span>import
org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.HConstants;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.LocalHBaseCluster;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.ServerName;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;<a
name="line.32"></a>
+<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.master.LoadBalancer;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.master.ServerManager;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a
name="line.37"></a>
+<span class="sourceLineNo">038</span>import
org.apache.zookeeper.KeeperException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.junit.After;<a
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.Before;<a
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Rule;<a
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.Test;<a
name="line.42"></a>
+<span class="sourceLineNo">043</span>import
org.junit.experimental.categories.Category;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.rules.TestRule;<a
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a
name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a
name="line.46"></a>
<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span> private static final Logger LOG =
LoggerFactory.getLogger(TestRegionServerReportForDuty.class);<a
name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> private static final long
SLEEP_INTERVAL = 500;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private HBaseTestingUtility testUtil;<a
name="line.52"></a>
-<span class="sourceLineNo">053</span> private LocalHBaseCluster cluster;<a
name="line.53"></a>
-<span class="sourceLineNo">054</span> private RegionServerThread rs;<a
name="line.54"></a>
-<span class="sourceLineNo">055</span> private RegionServerThread rs2;<a
name="line.55"></a>
-<span class="sourceLineNo">056</span> private MasterThread master;<a
name="line.56"></a>
-<span class="sourceLineNo">057</span> private MasterThread backupMaster;<a
name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Before<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public void setUp() throws Exception
{<a name="line.60"></a>
-<span class="sourceLineNo">061</span> testUtil = new
HBaseTestingUtility();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> testUtil.startMiniDFSCluster(1);<a
name="line.62"></a>
-<span class="sourceLineNo">063</span> testUtil.startMiniZKCluster(1);<a
name="line.63"></a>
-<span class="sourceLineNo">064</span> testUtil.createRootDir();<a
name="line.64"></a>
-<span class="sourceLineNo">065</span> cluster = new
LocalHBaseCluster(testUtil.getConfiguration(), 0, 0);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> @After<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public void tearDown() throws Exception
{<a name="line.69"></a>
-<span class="sourceLineNo">070</span> cluster.shutdown();<a
name="line.70"></a>
-<span class="sourceLineNo">071</span> cluster.join();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> testUtil.shutdownMiniZKCluster();<a
name="line.72"></a>
-<span class="sourceLineNo">073</span> testUtil.shutdownMiniDFSCluster();<a
name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * Tests region sever reportForDuty
with backup master becomes primary master after<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * the first master goes away.<a
name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> @Test (timeout=180000)<a
name="line.80"></a>
-<span class="sourceLineNo">081</span> public void
testReportForDutyWithMasterChange() throws Exception {<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> // Start a master and wait for it to
become the active/primary master.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // Use a random unique port<a
name="line.84"></a>
-<span class="sourceLineNo">085</span>
cluster.getConfiguration().setInt(HConstants.MASTER_PORT,
HBaseTestingUtility.randomFreePort());<a name="line.85"></a>
-<span class="sourceLineNo">086</span> // master has a rs. defaultMinToStart
= 2<a name="line.86"></a>
-<span class="sourceLineNo">087</span> boolean tablesOnMaster =
LoadBalancer.isTablesOnMaster(testUtil.getConfiguration());<a
name="line.87"></a>
-<span class="sourceLineNo">088</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
tablesOnMaster? 2: 1);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART,
tablesOnMaster? 2: 1);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> master = cluster.addMaster();<a
name="line.90"></a>
-<span class="sourceLineNo">091</span> rs = cluster.addRegionServer();<a
name="line.91"></a>
-<span class="sourceLineNo">092</span> LOG.debug("Starting master: " +
master.getMaster().getServerName());<a name="line.92"></a>
-<span class="sourceLineNo">093</span> master.start();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> rs.start();<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> waitForClusterOnline(master);<a
name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> // Add a 2nd region server<a
name="line.98"></a>
-<span class="sourceLineNo">099</span>
cluster.getConfiguration().set(HConstants.REGION_SERVER_IMPL,
MyRegionServer.class.getName());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> rs2 = cluster.addRegionServer();<a
name="line.100"></a>
-<span class="sourceLineNo">101</span> // Start the region server. This
region server will refresh RPC connection<a name="line.101"></a>
-<span class="sourceLineNo">102</span> // from the current active master to
the next active master before completing<a name="line.102"></a>
-<span class="sourceLineNo">103</span> // reportForDuty<a
name="line.103"></a>
-<span class="sourceLineNo">104</span> LOG.debug("Starting 2nd region
server: " + rs2.getRegionServer().getServerName());<a name="line.104"></a>
-<span class="sourceLineNo">105</span> rs2.start();<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> waitForSecondRsStarted();<a
name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> // Stop the current master.<a
name="line.109"></a>
-<span class="sourceLineNo">110</span> master.getMaster().stop("Stopping
master");<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> // Start a new master and use another
random unique port<a name="line.112"></a>
-<span class="sourceLineNo">113</span> // Also let it wait for exactly 2
region severs to report in.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>
cluster.getConfiguration().setInt(HConstants.MASTER_PORT,
HBaseTestingUtility.randomFreePort());<a name="line.114"></a>
-<span class="sourceLineNo">115</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,<a
name="line.115"></a>
-<span class="sourceLineNo">116</span> tablesOnMaster? 3: 2);<a
name="line.116"></a>
-<span class="sourceLineNo">117</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART,<a
name="line.117"></a>
-<span class="sourceLineNo">118</span> tablesOnMaster? 3: 2);<a
name="line.118"></a>
-<span class="sourceLineNo">119</span> backupMaster = cluster.addMaster();<a
name="line.119"></a>
-<span class="sourceLineNo">120</span> LOG.debug("Starting new master: " +
backupMaster.getMaster().getServerName());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> backupMaster.start();<a
name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> waitForClusterOnline(backupMaster);<a
name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Do some checking/asserts here.<a
name="line.125"></a>
-<span class="sourceLineNo">126</span>
assertTrue(backupMaster.getMaster().isActiveMaster());<a name="line.126"></a>
-<span class="sourceLineNo">127</span>
assertTrue(backupMaster.getMaster().isInitialized());<a name="line.127"></a>
-<span class="sourceLineNo">128</span>
assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(),<a
name="line.128"></a>
-<span class="sourceLineNo">129</span> tablesOnMaster? 3: 2);<a
name="line.129"></a>
+<span class="sourceLineNo">048</span>@Category(MediumTests.class)<a
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class
TestRegionServerReportForDuty {<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> private static final Logger LOG =
LoggerFactory.getLogger(TestRegionServerReportForDuty.class);<a
name="line.51"></a>
+<span class="sourceLineNo">052</span> @Rule<a name="line.52"></a>
+<span class="sourceLineNo">053</span> public final TestRule timeout =
CategoryBasedTimeout.builder().withTimeout(this.getClass())<a
name="line.53"></a>
+<span class="sourceLineNo">054</span>
.withLookingForStuckThread(true).build();<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> private static final long
SLEEP_INTERVAL = 500;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private HBaseTestingUtility testUtil;<a
name="line.58"></a>
+<span class="sourceLineNo">059</span> private LocalHBaseCluster cluster;<a
name="line.59"></a>
+<span class="sourceLineNo">060</span> private RegionServerThread rs;<a
name="line.60"></a>
+<span class="sourceLineNo">061</span> private RegionServerThread rs2;<a
name="line.61"></a>
+<span class="sourceLineNo">062</span> private MasterThread master;<a
name="line.62"></a>
+<span class="sourceLineNo">063</span> private MasterThread backupMaster;<a
name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> @Before<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public void setUp() throws Exception
{<a name="line.66"></a>
+<span class="sourceLineNo">067</span> testUtil = new
HBaseTestingUtility();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> testUtil.startMiniDFSCluster(1);<a
name="line.68"></a>
+<span class="sourceLineNo">069</span> testUtil.startMiniZKCluster(1);<a
name="line.69"></a>
+<span class="sourceLineNo">070</span> testUtil.createRootDir();<a
name="line.70"></a>
+<span class="sourceLineNo">071</span> cluster = new
LocalHBaseCluster(testUtil.getConfiguration(), 0, 0);<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> @After<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public void tearDown() throws Exception
{<a name="line.75"></a>
+<span class="sourceLineNo">076</span> cluster.shutdown();<a
name="line.76"></a>
+<span class="sourceLineNo">077</span> cluster.join();<a name="line.77"></a>
+<span class="sourceLineNo">078</span> testUtil.shutdownMiniZKCluster();<a
name="line.78"></a>
+<span class="sourceLineNo">079</span> testUtil.shutdownMiniDFSCluster();<a
name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Tests region sever reportForDuty
with backup master becomes primary master after<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * the first master goes away.<a
name="line.84"></a>
+<span class="sourceLineNo">085</span> */<a name="line.85"></a>
+<span class="sourceLineNo">086</span> @Test<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public void
testReportForDutyWithMasterChange() throws Exception {<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> // Start a master and wait for it to
become the active/primary master.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> // Use a random unique port<a
name="line.90"></a>
+<span class="sourceLineNo">091</span>
cluster.getConfiguration().setInt(HConstants.MASTER_PORT,
HBaseTestingUtility.randomFreePort());<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // master has a rs. defaultMinToStart
= 2<a name="line.92"></a>
+<span class="sourceLineNo">093</span> boolean tablesOnMaster =
LoadBalancer.isTablesOnMaster(testUtil.getConfiguration());<a
name="line.93"></a>
+<span class="sourceLineNo">094</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
tablesOnMaster? 2: 1);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART,
tablesOnMaster? 2: 1);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> master = cluster.addMaster();<a
name="line.96"></a>
+<span class="sourceLineNo">097</span> rs = cluster.addRegionServer();<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> LOG.debug("Starting master: " +
master.getMaster().getServerName());<a name="line.98"></a>
+<span class="sourceLineNo">099</span> master.start();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> rs.start();<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> waitForClusterOnline(master);<a
name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> // Add a 2nd region server<a
name="line.104"></a>
+<span class="sourceLineNo">105</span>
cluster.getConfiguration().set(HConstants.REGION_SERVER_IMPL,
MyRegionServer.class.getName());<a name="line.105"></a>
+<span class="sourceLineNo">106</span> rs2 = cluster.addRegionServer();<a
name="line.106"></a>
+<span class="sourceLineNo">107</span> // Start the region server. This
region server will refresh RPC connection<a name="line.107"></a>
+<span class="sourceLineNo">108</span> // from the current active master to
the next active master before completing<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // reportForDuty<a
name="line.109"></a>
+<span class="sourceLineNo">110</span> LOG.debug("Starting 2nd region
server: " + rs2.getRegionServer().getServerName());<a name="line.110"></a>
+<span class="sourceLineNo">111</span> rs2.start();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> waitForSecondRsStarted();<a
name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> // Stop the current master.<a
name="line.115"></a>
+<span class="sourceLineNo">116</span> master.getMaster().stop("Stopping
master");<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> // Start a new master and use another
random unique port<a name="line.118"></a>
+<span class="sourceLineNo">119</span> // Also let it wait for exactly 2
region severs to report in.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>
cluster.getConfiguration().setInt(HConstants.MASTER_PORT,
HBaseTestingUtility.randomFreePort());<a name="line.120"></a>
+<span class="sourceLineNo">121</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,<a
name="line.121"></a>
+<span class="sourceLineNo">122</span> tablesOnMaster? 3: 2);<a
name="line.122"></a>
+<span class="sourceLineNo">123</span>
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART,<a
name="line.123"></a>
+<span class="sourceLineNo">124</span> tablesOnMaster? 3: 2);<a
name="line.124"></a>
+<span class="sourceLineNo">125</span> backupMaster = cluster.addMaster();<a
name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.debug("Starting new master: " +
backupMaster.getMaster().getServerName());<a name="line.126"></a>
+<span class="sourceLineNo">127</span> backupMaster.start();<a
name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> waitForClusterOnline(backupMaster);<a
name="line.129"></a>
<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> private void
waitForClusterOnline(MasterThread master) throws InterruptedException {<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> while (true) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if
(master.getMaster().isInitialized()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> break;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.138"></a>
-<span class="sourceLineNo">139</span> LOG.debug("Waiting for master to
come online ...");<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span> rs.waitForServerOnline();<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> private void waitForSecondRsStarted()
throws InterruptedException {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> while (true) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (((MyRegionServer)
rs2.getRegionServer()).getRpcStubCreatedFlag() == true) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> break;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.149"></a>
-<span class="sourceLineNo">150</span> LOG.debug("Waiting 2nd RS to be
started ...");<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><a name="line.153"></a>
-<span class="sourceLineNo">154</span> // Create a Region Server that provide
a hook so that we can wait for the master switch over<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // before continuing reportForDuty to
the mater.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> // The idea is that we get a RPC
connection to the first active master, then we wait.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // The first master goes down, the
second master becomes the active master. The region<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // server continues reportForDuty. It
should succeed with the new master.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public static class MyRegionServer
extends MiniHBaseClusterRegionServer {<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> private ServerName sn;<a
name="line.161"></a>
-<span class="sourceLineNo">162</span> // This flag is to make sure this rs
has obtained the rpcStub to the first master.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // The first master will go down
after this.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> private boolean rpcStubCreatedFlag =
false;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> private boolean masterChanged =
false;<a name="line.165"></a>
+<span class="sourceLineNo">131</span> // Do some checking/asserts here.<a
name="line.131"></a>
+<span class="sourceLineNo">132</span>
assertTrue(backupMaster.getMaster().isActiveMaster());<a name="line.132"></a>
+<span class="sourceLineNo">133</span>
assertTrue(backupMaster.getMaster().isInitialized());<a name="line.133"></a>
+<span class="sourceLineNo">134</span>
assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(),<a
name="line.134"></a>
+<span class="sourceLineNo">135</span> tablesOnMaster? 3: 2);<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> private void
waitForClusterOnline(MasterThread master) throws InterruptedException {<a
name="line.139"></a>
+<span class="sourceLineNo">140</span> while (true) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if
(master.getMaster().isInitialized()) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> break;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.144"></a>
+<span class="sourceLineNo">145</span> LOG.debug("Waiting for master to
come online ...");<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> rs.waitForServerOnline();<a
name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> private void waitForSecondRsStarted()
throws InterruptedException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> while (true) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> if (((MyRegionServer)
rs2.getRegionServer()).getRpcStubCreatedFlag() == true) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> break;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.debug("Waiting 2nd RS to be
started ...");<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> // Create a Region Server that provide
a hook so that we can wait for the master switch over<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // before continuing reportForDuty to
the mater.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // The idea is that we get a RPC
connection to the first active master, then we wait.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> // The first master goes down, the
second master becomes the active master. The region<a name="line.163"></a>
+<span class="sourceLineNo">164</span> // server continues reportForDuty. It
should succeed with the new master.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> public static class MyRegionServer
extends MiniHBaseClusterRegionServer {<a name="line.165"></a>
<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> public MyRegionServer(Configuration
conf) throws IOException, KeeperException,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> InterruptedException {<a
name="line.168"></a>
-<span class="sourceLineNo">169</span> super(conf);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> @Override<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected synchronized ServerName
createRegionServerStatusStub(boolean refresh) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> sn =
super.createRegionServerStatusStub(refresh);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rpcStubCreatedFlag = true;<a
name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> // Wait for master switch over.
Only do this for the second region server.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> while (!masterChanged) {<a
name="line.178"></a>
-<span class="sourceLineNo">179</span> ServerName newSn =
super.getMasterAddressTracker().getMasterAddress(true);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (newSn != null &&
!newSn.equals(sn)) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> masterChanged = true;<a
name="line.181"></a>
-<span class="sourceLineNo">182</span> break;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> try {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.185"></a>
-<span class="sourceLineNo">186</span> } catch (InterruptedException e)
{<a name="line.186"></a>
-<span class="sourceLineNo">187</span> return null;<a
name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> LOG.debug("Waiting for master
switch over ... ");<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return sn;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> public boolean
getRpcStubCreatedFlag() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return rpcStubCreatedFlag;<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>}<a name="line.198"></a>
+<span class="sourceLineNo">167</span> private ServerName sn;<a
name="line.167"></a>
+<span class="sourceLineNo">168</span> // This flag is to make sure this rs
has obtained the rpcStub to the first master.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // The first master will go down
after this.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> private boolean rpcStubCreatedFlag =
false;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> private boolean masterChanged =
false;<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> public MyRegionServer(Configuration
conf) throws IOException, KeeperException,<a name="line.173"></a>
+<span class="sourceLineNo">174</span> InterruptedException {<a
name="line.174"></a>
+<span class="sourceLineNo">175</span> super(conf);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> protected synchronized ServerName
createRegionServerStatusStub(boolean refresh) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> sn =
super.createRegionServerStatusStub(refresh);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> rpcStubCreatedFlag = true;<a
name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span> // Wait for master switch over.
Only do this for the second region server.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> while (!masterChanged) {<a
name="line.184"></a>
+<span class="sourceLineNo">185</span> ServerName newSn =
super.getMasterAddressTracker().getMasterAddress(true);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (newSn != null &&
!newSn.equals(sn)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> masterChanged = true;<a
name="line.187"></a>
+<span class="sourceLineNo">188</span> break;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> try {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> Thread.sleep(SLEEP_INTERVAL);<a
name="line.191"></a>
+<span class="sourceLineNo">192</span> } catch (InterruptedException e)
{<a name="line.192"></a>
+<span class="sourceLineNo">193</span> return null;<a
name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> LOG.debug("Waiting for master
switch over ... ");<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return sn;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> public boolean
getRpcStubCreatedFlag() {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return rpcStubCreatedFlag;<a
name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>}<a name="line.204"></a>
