hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [14/51] [partial] hbase-site git commit: Published site at .
Date Fri, 19 Jan 2018 15:31:05 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/14db89d7/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
index 1636aa6..f79f186 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
@@ -86,811 +86,824 @@
 <span class="sourceLineNo">078</span>   */<a name="line.78"></a>
 <span class="sourceLineNo">079</span>  public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers)<a name="line.79"></a>
 <span class="sourceLineNo">080</span>      throws IOException, InterruptedException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    this(conf, numMasters, numRegionServers, null, null, null);<a name="line.81"></a>
+<span class="sourceLineNo">081</span>    this(conf, numMasters, numRegionServers, null, null);<a name="line.81"></a>
 <span class="sourceLineNo">082</span>  }<a name="line.82"></a>
 <span class="sourceLineNo">083</span><a name="line.83"></a>
 <span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * @param rsPorts Ports that RegionServer should use; pass ports if you want to test cluster<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   *   restart where for sure the regionservers come up on same address+port (but<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   *   just with different startcode); by default mini hbase clusters choose new<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   *   arbitrary ports on each cluster start.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @throws IOException<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   * @throws InterruptedException<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   */<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers,<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         List&lt;Integer&gt; rsPorts,<a name="line.93"></a>
-<span class="sourceLineNo">094</span>         Class&lt;? extends HMaster&gt; masterClass,<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         Class&lt;? extends MiniHBaseCluster.MiniHBaseClusterRegionServer&gt; regionserverClass)<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      throws IOException, InterruptedException {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    super(conf);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    conf.set(HConstants.MASTER_PORT, "0");<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      conf.set(HConstants.MASTER_INFO_PORT, "0");<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    // Hadoop 2<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>    init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    this.initialClusterStatus = getClusterStatus();<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>  public Configuration getConfiguration() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    return this.conf;<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>  /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * Subclass so can get at protected methods (none at moment).  Also, creates<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * a FileSystem instance per instantiation.  Adds a shutdown own FileSystem<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * the FileSystem system exit hook does.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    private Thread shutdownThread = null;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private User user = null;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span>     * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>     * so any restarted instances of the same server will have different ServerName and will not<a name="line.125"></a>
-<span class="sourceLineNo">126</span>     * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>     */<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    static Set&lt;ServerName&gt; killedServers = new HashSet&lt;&gt;();<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        throws IOException, InterruptedException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      super(conf);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      this.user = User.getCurrent();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>    /*<a name="line.136"></a>
-<span class="sourceLineNo">137</span>     * @param c<a name="line.137"></a>
-<span class="sourceLineNo">138</span>     * @param currentfs We return this if we did not make a new one.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>     * @param uniqueName Same name used to help identify the created fs.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>     * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.140"></a>
-<span class="sourceLineNo">141</span>     * @throws IOException<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>    @Override<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    protected void handleReportForDutyResponse(<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        final RegionServerStartupResponse c) throws IOException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      super.handleReportForDutyResponse(c);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // Run this thread to shutdown our filesystem on way out.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public void run() {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      try {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        this.user.runAs(new PrivilegedAction&lt;Object&gt;(){<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          public Object run() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>            runRegionServer();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>            return null;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>          }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        });<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      } catch (Throwable t) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        LOG.error("Exception in run", t);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      } finally {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        // Run this on the way out.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        if (this.shutdownThread != null) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>          this.shutdownThread.start();<a name="line.166"></a>
-<span class="sourceLineNo">167</span>          Threads.shutdown(this.shutdownThread, 30000);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    private void runRegionServer() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      super.run();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>    @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    protected void kill() {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      killedServers.add(getServerName());<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      super.kill();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>    @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    public void abort(final String reason, final Throwable cause) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      this.user.runAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        public Object run() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          abortRegionServer(reason, cause);<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>      });<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>    private void abortRegionServer(String reason, Throwable cause) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      super.abort(reason, cause);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /**<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * Alternate shutdown hook.<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  static class SingleFileSystemShutdownThread extends Thread {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    private final FileSystem fs;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      super("Shutdown of " + fs);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      this.fs = fs;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public void run() {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      try {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        LOG.info("Hook closing fs=" + this.fs);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        this.fs.close();<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      } catch (NullPointerException npe) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        LOG.debug("Need to fix these: " + npe.toString());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      } catch (IOException e) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        LOG.warn("Running hook", e);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  private void init(final int nMasterNodes, final int nRegionNodes, List&lt;Integer&gt; rsPorts,<a name="line.220"></a>
-<span class="sourceLineNo">221</span>                 Class&lt;? extends HMaster&gt; masterClass,<a name="line.221"></a>
-<span class="sourceLineNo">222</span>                 Class&lt;? extends MiniHBaseCluster.MiniHBaseClusterRegionServer&gt; regionserverClass)<a name="line.222"></a>
-<span class="sourceLineNo">223</span>  throws IOException, InterruptedException {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    try {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      if (masterClass == null){<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        masterClass =  HMaster.class;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      if (regionserverClass == null){<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>      // start up a LocalHBaseCluster<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.233"></a>
-<span class="sourceLineNo">234</span>          masterClass, regionserverClass);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>      // manually add the regionservers as other users<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      for (int i = 0; i &lt; nRegionNodes; i++) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        if (rsPorts != null) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>            ".hfs."+index++);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>      hbaseCluster.startup();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    } catch (IOException e) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      shutdown();<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      throw e;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    } catch (Throwable t) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      LOG.error("Error starting cluster", t);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      shutdown();<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      throw new IOException("Shutting down", t);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  }<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>  @Override<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  public void startRegionServer(String hostname, int port) throws IOException {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    this.startRegionServer();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>  @Override<a name="line.263"></a>
-<span class="sourceLineNo">264</span>  public void killRegionServer(ServerName serverName) throws IOException {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      LOG.info("Killing " + server.toString());<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      ((MiniHBaseClusterRegionServer) server).kill();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    } else {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      abortRegionServer(getRegionServerIndex(serverName));<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  @Override<a name="line.274"></a>
-<span class="sourceLineNo">275</span>  public boolean isKilledRS(ServerName serverName) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>  }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>  @Override<a name="line.279"></a>
-<span class="sourceLineNo">280</span>  public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    stopRegionServer(getRegionServerIndex(serverName));<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>  @Override<a name="line.284"></a>
-<span class="sourceLineNo">285</span>  public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    //ignore timeout for now<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>  @Override<a name="line.290"></a>
-<span class="sourceLineNo">291</span>  public void startZkNode(String hostname, int port) throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>  @Override<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  public void killZkNode(ServerName serverName) throws IOException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.297"></a>
-<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>  @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span>  public void stopZkNode(ServerName serverName) throws IOException {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>  @Override<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>  @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>  public void startDataNode(ServerName serverName) throws IOException {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  @Override<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  public void killDataNode(ServerName serverName) throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  @Override<a name="line.325"></a>
-<span class="sourceLineNo">326</span>  public void stopDataNode(ServerName serverName) throws IOException {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Override<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  @Override<a name="line.335"></a>
-<span class="sourceLineNo">336</span>  public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  public void startMaster(String hostname, int port) throws IOException {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    this.startMaster();<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
-<span class="sourceLineNo">346</span>  public void killMaster(ServerName serverName) throws IOException {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    abortMaster(getMasterIndex(serverName));<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>  @Override<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  public void stopMaster(ServerName serverName) throws IOException {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    stopMaster(getMasterIndex(serverName));<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>  @Override<a name="line.355"></a>
-<span class="sourceLineNo">356</span>  public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    //ignore timeout for now<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    waitOnMaster(getMasterIndex(serverName));<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>  /**<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * Starts a region server thread running<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   *<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * @throws IOException<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @return New RegionServerThread<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.367"></a>
-<span class="sourceLineNo">368</span>      throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    User rsUser =<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    JVMClusterUtil.RegionServerThread t =  null;<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    try {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      t = hbaseCluster.addRegionServer(<a name="line.374"></a>
-<span class="sourceLineNo">375</span>          newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      t.start();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      t.waitForServerOnline();<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    } catch (InterruptedException ie) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    return t;<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>  /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * when it can't start a region server or when the region server is not processed by master<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * within the timeout.<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   *<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @return New RegionServerThread<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   */<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      throws IOException {<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    JVMClusterUtil.RegionServerThread t =  startRegionServer();<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.395"></a>
+<span class="sourceLineNo">085</span>   * Start a MiniHBaseCluster.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * @param conf Configuration to be used for cluster<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * @param numMasters initial number of masters to start.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * @param numRegionServers initial number of region servers to start.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers,<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         Class&lt;? extends HMaster&gt; masterClass,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         Class&lt;? extends MiniHBaseCluster.MiniHBaseClusterRegionServer&gt; regionserverClass)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      throws IOException, InterruptedException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    this(conf, numMasters, numRegionServers, null, masterClass, regionserverClass);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * @param rsPorts Ports that RegionServer should use; pass ports if you want to test cluster<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   *   restart where for sure the regionservers come up on same address+port (but<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   *   just with different startcode); by default mini hbase clusters choose new<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   *   arbitrary ports on each cluster start.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * @throws IOException<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * @throws InterruptedException<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers,<a name="line.105"></a>
+<span class="sourceLineNo">106</span>         List&lt;Integer&gt; rsPorts,<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         Class&lt;? extends HMaster&gt; masterClass,<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         Class&lt;? extends MiniHBaseCluster.MiniHBaseClusterRegionServer&gt; regionserverClass)<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      throws IOException, InterruptedException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    super(conf);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    conf.set(HConstants.MASTER_PORT, "0");<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      conf.set(HConstants.MASTER_INFO_PORT, "0");<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>    // Hadoop 2<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    this.initialClusterStatus = getClusterStatus();<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  public Configuration getConfiguration() {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    return this.conf;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * Subclass so can get at protected methods (none at moment).  Also, creates<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * a FileSystem instance per instantiation.  Adds a shutdown own FileSystem<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * the FileSystem system exit hook does.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   */<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    private Thread shutdownThread = null;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    private User user = null;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.137"></a>
+<span class="sourceLineNo">138</span>     * so any restarted instances of the same server will have different ServerName and will not<a name="line.138"></a>
+<span class="sourceLineNo">139</span>     * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.139"></a>
+<span class="sourceLineNo">140</span>     */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    static Set&lt;ServerName&gt; killedServers = new HashSet&lt;&gt;();<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        throws IOException, InterruptedException {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      super(conf);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.user = User.getCurrent();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    /*<a name="line.149"></a>
+<span class="sourceLineNo">150</span>     * @param c<a name="line.150"></a>
+<span class="sourceLineNo">151</span>     * @param currentfs We return this if we did not make a new one.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>     * @param uniqueName Same name used to help identify the created fs.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>     * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>     * @throws IOException<a name="line.154"></a>
+<span class="sourceLineNo">155</span>     */<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    protected void handleReportForDutyResponse(<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        final RegionServerStartupResponse c) throws IOException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      super.handleReportForDutyResponse(c);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      // Run this thread to shutdown our filesystem on way out.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>    @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public void run() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      try {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        this.user.runAs(new PrivilegedAction&lt;Object&gt;(){<a name="line.168"></a>
+<span class="sourceLineNo">169</span>          public Object run() {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            runRegionServer();<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            return null;<a name="line.171"></a>
+<span class="sourceLineNo">172</span>          }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        });<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      } catch (Throwable t) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        LOG.error("Exception in run", t);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      } finally {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        // Run this on the way out.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        if (this.shutdownThread != null) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          this.shutdownThread.start();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          Threads.shutdown(this.shutdownThread, 30000);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>    private void runRegionServer() {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      super.run();<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>    @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    protected void kill() {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      killedServers.add(getServerName());<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      super.kill();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>    @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    public void abort(final String reason, final Throwable cause) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      this.user.runAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        public Object run() {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>          abortRegionServer(reason, cause);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>          return null;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      });<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>    private void abortRegionServer(String reason, Throwable cause) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      super.abort(reason, cause);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * Alternate shutdown hook.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   */<a name="line.213"></a>
+<span class="sourceLineNo">214</span>  static class SingleFileSystemShutdownThread extends Thread {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    private final FileSystem fs;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      super("Shutdown of " + fs);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      this.fs = fs;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    @Override<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    public void run() {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      try {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        LOG.info("Hook closing fs=" + this.fs);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        this.fs.close();<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      } catch (NullPointerException npe) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        LOG.debug("Need to fix these: " + npe.toString());<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      } catch (IOException e) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        LOG.warn("Running hook", e);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>  private void init(final int nMasterNodes, final int nRegionNodes, List&lt;Integer&gt; rsPorts,<a name="line.233"></a>
+<span class="sourceLineNo">234</span>                 Class&lt;? extends HMaster&gt; masterClass,<a name="line.234"></a>
+<span class="sourceLineNo">235</span>                 Class&lt;? extends MiniHBaseCluster.MiniHBaseClusterRegionServer&gt; regionserverClass)<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  throws IOException, InterruptedException {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      if (masterClass == null){<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        masterClass =  HMaster.class;<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      }<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      if (regionserverClass == null){<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>      // start up a LocalHBaseCluster<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.246"></a>
+<span class="sourceLineNo">247</span>          masterClass, regionserverClass);<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>      // manually add the regionservers as other users<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      for (int i = 0; i &lt; nRegionNodes; i++) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>        Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        if (rsPorts != null) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>          rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        }<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            ".hfs."+index++);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>      hbaseCluster.startup();<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    } catch (IOException e) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      shutdown();<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      throw e;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    } catch (Throwable t) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      LOG.error("Error starting cluster", t);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      shutdown();<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      throw new IOException("Shutting down", t);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>  @Override<a name="line.271"></a>
+<span class="sourceLineNo">272</span>  public void startRegionServer(String hostname, int port) throws IOException {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    this.startRegionServer();<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>  @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public void killRegionServer(ServerName serverName) throws IOException {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      LOG.info("Killing " + server.toString());<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      ((MiniHBaseClusterRegionServer) server).kill();<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    } else {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      abortRegionServer(getRegionServerIndex(serverName));<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>  @Override<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  public boolean isKilledRS(ServerName serverName) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>  @Override<a name="line.292"></a>
+<span class="sourceLineNo">293</span>  public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    stopRegionServer(getRegionServerIndex(serverName));<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>  @Override<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    //ignore timeout for now<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.300"></a>
+<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span>  @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public void startZkNode(String hostname, int port) throws IOException {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.305"></a>
+<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>  @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span>  public void killZkNode(ServerName serverName) throws IOException {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>  @Override<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  public void stopZkNode(ServerName serverName) throws IOException {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>  }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>  @Override<a name="line.318"></a>
+<span class="sourceLineNo">319</span>  public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span>  @Override<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>  @Override<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  public void startDataNode(ServerName serverName) throws IOException {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>  @Override<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  public void killDataNode(ServerName serverName) throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.335"></a>
+<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>  @Override<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  public void stopDataNode(ServerName serverName) throws IOException {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>  @Override<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>  @Override<a name="line.353"></a>
+<span class="sourceLineNo">354</span>  public void startMaster(String hostname, int port) throws IOException {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    this.startMaster();<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>  @Override<a name="line.358"></a>
+<span class="sourceLineNo">359</span>  public void killMaster(ServerName serverName) throws IOException {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    abortMaster(getMasterIndex(serverName));<a name="line.360"></a>
+<span class="sourceLineNo">361</span>  }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span>  @Override<a name="line.363"></a>
+<span class="sourceLineNo">364</span>  public void stopMaster(ServerName serverName) throws IOException {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    stopMaster(getMasterIndex(serverName));<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>  @Override<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    //ignore timeout for now<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    waitOnMaster(getMasterIndex(serverName));<a name="line.371"></a>
+<span class="sourceLineNo">372</span>  }<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span>  /**<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   * Starts a region server thread running<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   *<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * @throws IOException<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * @return New RegionServerThread<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    User rsUser =<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    JVMClusterUtil.RegionServerThread t =  null;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    try {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      t = hbaseCluster.addRegionServer(<a name="line.387"></a>
+<span class="sourceLineNo">388</span>          newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      t.start();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      t.waitForServerOnline();<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    } catch (InterruptedException ie) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    return t;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
 <span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>    long start = System.currentTimeMillis();<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    ClusterStatus clusterStatus = getClusterStatus();<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    while ((System.currentTimeMillis() - start) &lt; timeout) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      if (clusterStatus != null &amp;&amp; clusterStatus.getServers().contains(rsServerName)) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        return t;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      Threads.sleep(100);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    if (t.getRegionServer().isOnline()) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      throw new IOException("RS: " + rsServerName + " is offline");<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><a name="line.411"></a>
-<span class="sourceLineNo">412</span>  /**<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   * Cause a region server to exit doing basic clean up only on its way out.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * @param serverNumber  Used as index into a list.<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   */<a name="line.415"></a>
-<span class="sourceLineNo">416</span>  public String abortRegionServer(int serverNumber) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    HRegionServer server = getRegionServer(serverNumber);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    LOG.info("Aborting " + server.toString());<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    return server.toString();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * Shut down the specified region server cleanly<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   *<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   * @param serverNumber  Used as index into a list.<a name="line.426"></a>
-<span class="sourceLineNo">427</span>   * @return the region server that was stopped<a name="line.427"></a>
+<span class="sourceLineNo">397</span>  /**<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * when it can't start a region server or when the region server is not processed by master<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * within the timeout.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   *<a name="line.401"></a>
+<span class="sourceLineNo">402</span>   * @return New RegionServerThread<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   */<a name="line.403"></a>
+<span class="sourceLineNo">404</span>  public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      throws IOException {<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    JVMClusterUtil.RegionServerThread t =  startRegionServer();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    long start = System.currentTimeMillis();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    ClusterStatus clusterStatus = getClusterStatus();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    while ((System.currentTimeMillis() - start) &lt; timeout) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      if (clusterStatus != null &amp;&amp; clusterStatus.getServers().contains(rsServerName)) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        return t;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      }<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      Threads.sleep(100);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    if (t.getRegionServer().isOnline()) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    } else {<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      throw new IOException("RS: " + rsServerName + " is offline");<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
+<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>  /**<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   * Cause a region server to exit doing basic clean up only on its way out.<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   * @param serverNumber  Used as index into a list.<a name="line.427"></a>
 <span class="sourceLineNo">428</span>   */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>  public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    return stopRegionServer(serverNumber, true);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>  }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>  /**<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * Shut down the specified region server cleanly<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   *<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * @param serverNumber  Used as index into a list.<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   * regionserver's shutdown.  Usually we do but you do not want to do this if<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * you are running multiple regionservers in a test and you shut down one<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   * before end of the test.<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   * @return the region server that was stopped<a name="line.441"></a>
-<span class="sourceLineNo">442</span>   */<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      final boolean shutdownFS) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    JVMClusterUtil.RegionServerThread server =<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      hbaseCluster.getRegionServers().get(serverNumber);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    LOG.info("Stopping " + server.toString());<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    return server;<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  }<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span>  /**<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   * Wait for the specified region server to stop. Removes this thread from list<a name="line.453"></a>
-<span class="sourceLineNo">454</span>   * of running threads.<a name="line.454"></a>
-<span class="sourceLineNo">455</span>   * @param serverNumber<a name="line.455"></a>
-<span class="sourceLineNo">456</span>   * @return Name of region server that just went down.<a name="line.456"></a>
-<span class="sourceLineNo">457</span>   */<a name="line.457"></a>
-<span class="sourceLineNo">458</span>  public String waitOnRegionServer(final int serverNumber) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>  }<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>  /**<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * Starts a master thread running<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   *<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * @return New RegionServerThread<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    Configuration c = HBaseConfiguration.create(conf);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    User user =<a name="line.470"></a>
-<span class="sourceLineNo">471</span>        HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    JVMClusterUtil.MasterThread t = null;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    try {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      t.start();<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    } catch (InterruptedException ie) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      throw new IOException("Interrupted adding master to cluster", ie);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return t;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<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>   * Returns the current active master, if available.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @return the active HMaster, null if none is active.<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
-<span class="sourceLineNo">487</span>  public MasterService.BlockingInterface getMasterAdminService() {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<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>  /**<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   * Returns the current active master, if available.<a name="line.492"></a>
-<span class="sourceLineNo">493</span>   * @return the active HMaster, null if none is active.<a name="line.493"></a>
-<span class="sourceLineNo">494</span>   */<a name="line.494"></a>
-<span class="sourceLineNo">495</span>  public HMaster getMaster() {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    return this.hbaseCluster.getActiveMaster();<a name="line.496"></a>
-<span class="sourceLineNo">497</span>  }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>  /**<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   * Returns the current active master thread, if available.<a name="line.500"></a>
-<span class="sourceLineNo">501</span>   * @return the active MasterThread, null if none is active.<a name="line.501"></a>
-<span class="sourceLineNo">502</span>   */<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  public MasterThread getMasterThread() {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      if (mt.getMaster().isActiveMaster()) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        return mt;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      }<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    }<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    return null;<a name="line.509"></a>
+<span class="sourceLineNo">429</span>  public String abortRegionServer(int serverNumber) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    HRegionServer server = getRegionServer(serverNumber);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    LOG.info("Aborting " + server.toString());<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    return server.toString();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>  }<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>   * Shut down the specified region server cleanly<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   *<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * @param serverNumber  Used as index into a list.<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * @return the region server that was stopped<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   */<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    return stopRegionServer(serverNumber, true);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span>  /**<a name="line.446"></a>
+<span class="sourceLineNo">447</span>   * Shut down the specified region server cleanly<a name="line.447"></a>
+<span class="sourceLineNo">448</span>   *<a name="line.448"></a>
+<span class="sourceLineNo">449</span>   * @param serverNumber  Used as index into a list.<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * regionserver's shutdown.  Usually we do but you do not want to do this if<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   * you are running multiple regionservers in a test and you shut down one<a name="line.452"></a>
+<span class="sourceLineNo">453</span>   * before end of the test.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>   * @return the region server that was stopped<a name="line.454"></a>
+<span class="sourceLineNo">455</span>   */<a name="line.455"></a>
+<span class="sourceLineNo">456</span>  public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      final boolean shutdownFS) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    JVMClusterUtil.RegionServerThread server =<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      hbaseCluster.getRegionServers().get(serverNumber);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    LOG.info("Stopping " + server.toString());<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    return server;<a name="line.462"></a>
+<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span>  /**<a name="line.465"></a>
+<span class="sourceLineNo">466</span>   * Wait for the specified region server to stop. Removes this thread from list<a name="line.466"></a>
+<span class="sourceLineNo">467</span>   * of running threads.<a name="line.467"></a>
+<span class="sourceLineNo">468</span>   * @param serverNumber<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   * @return Name of region server that just went down.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>   */<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public String waitOnRegionServer(final int serverNumber) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>  }<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>  /**<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   * Starts a master thread running<a name="line.477"></a>
+<span class="sourceLineNo">478</span>   *<a name="line.478"></a>
+<span class="sourceLineNo">479</span>   * @return New RegionServerThread<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   */<a name="line.480"></a>
+<span class="sourceLineNo">481</span>  public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    Configuration c = HBaseConfiguration.create(conf);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    User user =<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>    JVMClusterUtil.MasterThread t = null;<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    try {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      t.start();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    } catch (InterruptedException ie) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      throw new IOException("Interrupted adding master to cluster", ie);<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    return t;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>  }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>  /**<a name="line.496"></a>
+<span class="sourceLineNo">497</span>   * Returns the current active master, if available.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>   * @return the active HMaster, null if none is active.<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   */<a name="line.499"></a>
+<span class="sourceLineNo">500</span>  public MasterService.BlockingInterface getMasterAdminService() {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>  }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span>  /**<a name="line.504"></a>
+<span class="sourceLineNo">505</span>   * Returns the current active master, if available.<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   * @return the active HMaster, null if none is active.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   */<a name="line.507"></a>
+<span class="sourceLineNo">508</span>  public HMaster getMaster() {<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    return this.hbaseCluster.getActiveMaster();<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
 <span class="sourceLineNo">511</span><a name="line.511"></a>
 <span class="sourceLineNo">512</span>  /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span>   * Returns the master at the specified index, if available.<a name="line.513"></a>
-<span class="sourceLineNo">514</span>   * @return the active HMaster, null if none is active.<a name="line.514"></a>
+<span class="sourceLineNo">513</span>   * Returns the current active master thread, if available.<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   * @return the active MasterThread, null if none is active.<a name="line.514"></a>
 <span class="sourceLineNo">515</span>   */<a name="line.515"></a>
-<span class="sourceLineNo">516</span>  public HMaster getMaster(final int serverNumber) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    return this.hbaseCluster.getMaster(serverNumber);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>  }<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span>  /**<a name="line.520"></a>
-<span class="sourceLineNo">521</span>   * Cause a master to exit without shutting down entire cluster.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>   * @param serverNumber  Used as index into a list.<a name="line.522"></a>
-<span class="sourceLineNo">523</span>   */<a name="line.523"></a>
-<span class="sourceLineNo">524</span>  public String abortMaster(int serverNumber) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    HMaster server = getMaster(serverNumber);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    LOG.info("Aborting " + server.toString());<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    return server.toString();<a name="line.528"></a>
-<span class="sourceLineNo">529</span>  }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span>  /**<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   * Shut down the specified master cleanly<a name="line.532"></a>
-<span class="sourceLineNo">533</span>   *<a name="line.533"></a>
-<span class="sourceLineNo">534</span>   * @param serverNumber  Used as index into a list.<a name="line.534"></a>
-<span class="sourceLineNo">535</span>   * @return the region server that was stopped<a name="line.535"></a>
+<span class="sourceLineNo">516</span>  public MasterThread getMasterThread() {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      if (mt.getMaster().isActiveMaster()) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>        return mt;<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    }<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    return null;<a name="line.522"></a>
+<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span>  /**<a name="line.525"></a>
+<span class="sourceLineNo">526</span>   * Returns the master at the specified index, if available.<a name="line.526"></a>
+<span class="sourceLineNo">527</span>   * @return the active HMaster, null if none is active.<a name="line.527"></a>
+<span class="sourceLineNo">528</span>   */<a name="line.528"></a>
+<span class="sourceLineNo">529</span>  public HMaster getMaster(final int serverNumber) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    return this.hbaseCluster.getMaster(serverNumber);<a name="line.530"></a>
+<span class="sourceLineNo">531</span>  }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>  /**<a name="line.533"></a>
+<span class="sourceLineNo">534</span>   * Cause a master to exit without shutting down entire cluster.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * @param serverNumber  Used as index into a list.<a name="line.535"></a>
 <span class="sourceLineNo">536</span>   */<a name="line.536"></a>
-<span class="sourceLineNo">537</span>  public JVMClusterUtil.MasterThread stopMaster(int serverNumber) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    return stopMaster(serverNumber, true);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>  }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>  /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span>   * Shut down the specified master cleanly<a name="line.542"></a>
-<span class="sourceLineNo">543</span>   *<a name="line.543"></a>
-<span class="sourceLineNo">544</span>   * @param serverNumber  Used as index into a list.<a name="line.544"></a>
-<span class="sourceLineNo">545</span>   * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.545"></a>
-<span class="sourceLineNo">546</span>   * master's shutdown.  Usually we do but you do not want to do this if<a name="line.546"></a>
-<span class="sourceLineNo">547</span>   * you are running multiple master in a test and you shut down one<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   * before end of the test.<a name="line.548"></a>
-<span class="sourceLineNo">549</span>   * @return the master that was stopped<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   */<a name="line.550"></a>
-<span class="sourceLineNo">551</span>  public JVMClusterUtil.MasterThread stopMaster(int serverNumber,<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      final boolean shutdownFS) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    JVMClusterUtil.MasterThread server =<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      hbaseCluster.getMasters().get(serverNumber);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    LOG.info("Stopping " + server.toString());<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    server.getMaster().stop("Stopping master " + serverNumber);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    return server;<a name="line.557"></a>
-<span class="sourceLineNo">558</span>  }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span>  /**<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   * Wait for the specified master to stop. Removes this thread from list<a name="line.561"></a>
-<span class="sourceLineNo">562</span>   * of running threads.<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   * @param serverNumber<a name="line.563"></a>
-<span class="sourceLineNo">564</span>   * @return Name of master that just went down.<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   */<a name="line.565"></a>
-<span class="sourceLineNo">566</span>  public String waitOnMaster(final int serverNumber) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    return this.hbaseCluster.waitOnMaster(serverNumber);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>  }<a name="line.568"></a>
-<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span>  /**<a name="line.570"></a>
-<span class="sourceLineNo">571</span>   * Blocks until there is an active master and that master has completed<a name="line.57

<TRUNCATED>

Mime
View raw message