Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 2412674d2 -> ac54a6a86


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
index 8845041..9b07063 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
 <span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
@@ -31,64 +31,64 @@
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<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.HBaseClassTestRule;<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.HRegionInfo;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<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.ServerName;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Waiter;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.master.assignment.RegionStates;<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.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.zookeeper.KeeperException;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Tests handling of meta-carrying region 
server failover.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Category(MediumTests.class)<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>public class TestMetaShutdownHandler {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @ClassRule<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      
HBaseClassTestRule.forClass(TestMetaShutdownHandler.class);<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  final static Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @BeforeClass<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    TEST_UTIL.startMiniCluster(1, 3, 
null, null, MyRegionServer.class);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @AfterClass<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * This test will test the expire 
handling of a meta-carrying<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * region server.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * After HBaseMiniCluster is up, we 
will delete the ephemeral<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   * node of the meta-carrying region 
server, which will trigger<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * the expire of this region server on 
the master.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * On the other hand, we will slow down 
the abort process on<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * the region server so that it is 
still up during the master SSH.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * We will check that the master SSH is 
still successfully done.<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 
testExpireMetaRegionServer() throws Exception {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<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.HRegionInfo;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;<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.Waiter;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.master.assignment.RegionStates;<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.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.zookeeper.KeeperException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.AfterClass;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.BeforeClass;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Test;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.junit.experimental.categories.Category;<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>/**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Tests handling of meta-carrying region 
server failover.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category(MediumTests.class)<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestMetaShutdownHandler {<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestMetaShutdownHandler.class);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      
HBaseClassTestRule.forClass(TestMetaShutdownHandler.class);<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  final static Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  @BeforeClass<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    TEST_UTIL.startMiniCluster(1, 3, 
null, null, MyRegionServer.class);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  @AfterClass<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * This test will test the expire 
handling of a meta-carrying<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * region server.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * After HBaseMiniCluster is up, we 
will delete the ephemeral<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   * node of the meta-carrying region 
server, which will trigger<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * the expire of this region server on 
the master.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   * On the other hand, we will slow down 
the abort process on<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   * the region server so that it is 
still up during the master SSH.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   * We will check that the master SSH is 
still successfully done.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  @Test (timeout=180000)<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>  public void 
testExpireMetaRegionServer() throws Exception {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.83"></a>
 <span class="sourceLineNo">084</span>    HMaster master = 
cluster.getMaster();<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    RegionStates regionStates = 
master.getAssignmentManager().getRegionStates();<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    ServerName metaServerName = 
regionStates.getRegionServerOfRegion(<a name="line.86"></a>
@@ -96,23 +96,23 @@
 <span class="sourceLineNo">088</span>    if 
(master.getServerName().equals(metaServerName) || metaServerName == null<a 
name="line.88"></a>
 <span class="sourceLineNo">089</span>        || 
!metaServerName.equals(cluster.getServerHoldingMeta())) {<a name="line.89"></a>
 <span class="sourceLineNo">090</span>      // Move meta off master<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      metaServerName = 
cluster.getLiveRegionServerThreads()<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          
.get(0).getRegionServer().getServerName();<a name="line.92"></a>
+<span class="sourceLineNo">091</span>      metaServerName =<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>          
cluster.getLiveRegionServerThreads().get(0).getRegionServer().getServerName();<a
 name="line.92"></a>
 <span class="sourceLineNo">093</span>      
master.move(HRegionInfo.FIRST_META_REGIONINFO.getEncodedNameAsBytes(),<a 
name="line.93"></a>
 <span class="sourceLineNo">094</span>        
Bytes.toBytes(metaServerName.getServerName()));<a name="line.94"></a>
 <span class="sourceLineNo">095</span>      
TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    RegionState metaState =<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>        
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    assertEquals("Meta should be not in 
transition", RegionState.State.OPEN, metaState.getState());<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    assertNotEquals("Meta should be moved 
off master",<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      metaServerName, 
master.getServerName());<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    // Delete the ephemeral node of the 
meta-carrying region server.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    // This is trigger the expire of this 
region server on the master.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    String rsEphemeralNodePath =<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>        
ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, 
metaServerName.toString());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    
ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a 
name="line.107"></a>
+<span class="sourceLineNo">096</span>      metaServerName = 
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO);<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    RegionState metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertEquals("Wrong state for meta!", 
RegionState.State.OPEN, metaState.getState());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    assertNotEquals("Meta is on master!", 
metaServerName, master.getServerName());<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>    // Delete the ephemeral node of the 
meta-carrying region server.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    // This is trigger the expire of this 
region server on the master.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    String rsEphemeralNodePath =<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>        
ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, 
metaServerName.toString());<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    
ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    LOG.info("Deleted the znode for the 
RegionServer hosting hbase:meta; waiting on SSH");<a name="line.107"></a>
 <span class="sourceLineNo">108</span>    // Wait for SSH to finish<a 
name="line.108"></a>
 <span class="sourceLineNo">109</span>    final ServerManager serverManager = 
master.getServerManager();<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    final ServerName priorMetaServerName 
= metaServerName;<a name="line.110"></a>
@@ -123,39 +123,40 @@
 <span class="sourceLineNo">115</span>            &amp;&amp; 
!serverManager.areDeadServersInProgress();<a name="line.115"></a>
 <span class="sourceLineNo">116</span>      }<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    });<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">118</span>    LOG.info("Past wait on RIT");<a 
name="line.118"></a>
 <span class="sourceLineNo">119</span>    
TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.119"></a>
 <span class="sourceLineNo">120</span>    // Now, make sure meta is assigned<a 
name="line.120"></a>
 <span class="sourceLineNo">121</span>    assertTrue("Meta should be 
assigned",<a name="line.121"></a>
 <span class="sourceLineNo">122</span>      
regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.122"></a>
 <span class="sourceLineNo">123</span>    // Now, make sure meta is registered 
in zk<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    assertEquals("Meta should be not in 
transition", RegionState.State.OPEN, metaState.getState());<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    assertEquals("Meta should be 
assigned", metaState.getServerName(),<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    assertNotEquals("Meta should be 
assigned on a different server",<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      metaState.getServerName(), 
metaServerName);<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>  public static class MyRegionServer 
extends MiniHBaseClusterRegionServer {<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    public MyRegionServer(Configuration 
conf) throws IOException, KeeperException,<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        InterruptedException {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      super(conf);<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>    @Override<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public void abort(String reason, 
Throwable cause) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      // sleep to slow down the region 
server abort<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      try {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        Thread.sleep(30*1000);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      } catch (InterruptedException e) 
{<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        return;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      super.abort(reason, cause);<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>}<a name="line.150"></a>
+<span class="sourceLineNo">125</span>    assertEquals("Meta should not be in 
transition", RegionState.State.OPEN,<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        metaState.getState());<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    assertEquals("Meta should be 
assigned", metaState.getServerName(),<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    assertNotEquals("Meta should be 
assigned on a different server",<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      metaState.getServerName(), 
metaServerName);<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>  public static class MyRegionServer 
extends MiniHBaseClusterRegionServer {<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    public MyRegionServer(Configuration 
conf) throws IOException, KeeperException,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        InterruptedException {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      super(conf);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    @Override<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    public void abort(String reason, 
Throwable cause) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      // sleep to slow down the region 
server abort<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        Thread.sleep(30*1000);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      } catch (InterruptedException e) 
{<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        return;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      super.abort(reason, cause);<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
index 8845041..9b07063 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
 <span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
@@ -31,64 +31,64 @@
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<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.HBaseClassTestRule;<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.HRegionInfo;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<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.ServerName;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Waiter;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.master.assignment.RegionStates;<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.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.zookeeper.KeeperException;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Tests handling of meta-carrying region 
server failover.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Category(MediumTests.class)<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>public class TestMetaShutdownHandler {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @ClassRule<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      
HBaseClassTestRule.forClass(TestMetaShutdownHandler.class);<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  final static Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @BeforeClass<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    TEST_UTIL.startMiniCluster(1, 3, 
null, null, MyRegionServer.class);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @AfterClass<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * This test will test the expire 
handling of a meta-carrying<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * region server.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * After HBaseMiniCluster is up, we 
will delete the ephemeral<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   * node of the meta-carrying region 
server, which will trigger<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * the expire of this region server on 
the master.<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * On the other hand, we will slow down 
the abort process on<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * the region server so that it is 
still up during the master SSH.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * We will check that the master SSH is 
still successfully done.<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 
testExpireMetaRegionServer() throws Exception {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<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.HRegionInfo;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;<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.Waiter;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.master.assignment.RegionStates;<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.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.zookeeper.KeeperException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.AfterClass;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.BeforeClass;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Test;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.junit.experimental.categories.Category;<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>/**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Tests handling of meta-carrying region 
server failover.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category(MediumTests.class)<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestMetaShutdownHandler {<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestMetaShutdownHandler.class);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      
HBaseClassTestRule.forClass(TestMetaShutdownHandler.class);<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  final static Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  @BeforeClass<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    TEST_UTIL.startMiniCluster(1, 3, 
null, null, MyRegionServer.class);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  @AfterClass<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * This test will test the expire 
handling of a meta-carrying<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * region server.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * After HBaseMiniCluster is up, we 
will delete the ephemeral<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   * node of the meta-carrying region 
server, which will trigger<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * the expire of this region server on 
the master.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   * On the other hand, we will slow down 
the abort process on<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   * the region server so that it is 
still up during the master SSH.<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   * We will check that the master SSH is 
still successfully done.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  @Test (timeout=180000)<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>  public void 
testExpireMetaRegionServer() throws Exception {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.83"></a>
 <span class="sourceLineNo">084</span>    HMaster master = 
cluster.getMaster();<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    RegionStates regionStates = 
master.getAssignmentManager().getRegionStates();<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    ServerName metaServerName = 
regionStates.getRegionServerOfRegion(<a name="line.86"></a>
@@ -96,23 +96,23 @@
 <span class="sourceLineNo">088</span>    if 
(master.getServerName().equals(metaServerName) || metaServerName == null<a 
name="line.88"></a>
 <span class="sourceLineNo">089</span>        || 
!metaServerName.equals(cluster.getServerHoldingMeta())) {<a name="line.89"></a>
 <span class="sourceLineNo">090</span>      // Move meta off master<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      metaServerName = 
cluster.getLiveRegionServerThreads()<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          
.get(0).getRegionServer().getServerName();<a name="line.92"></a>
+<span class="sourceLineNo">091</span>      metaServerName =<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>          
cluster.getLiveRegionServerThreads().get(0).getRegionServer().getServerName();<a
 name="line.92"></a>
 <span class="sourceLineNo">093</span>      
master.move(HRegionInfo.FIRST_META_REGIONINFO.getEncodedNameAsBytes(),<a 
name="line.93"></a>
 <span class="sourceLineNo">094</span>        
Bytes.toBytes(metaServerName.getServerName()));<a name="line.94"></a>
 <span class="sourceLineNo">095</span>      
TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    RegionState metaState =<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>        
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    assertEquals("Meta should be not in 
transition", RegionState.State.OPEN, metaState.getState());<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    assertNotEquals("Meta should be moved 
off master",<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      metaServerName, 
master.getServerName());<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    // Delete the ephemeral node of the 
meta-carrying region server.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    // This is trigger the expire of this 
region server on the master.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    String rsEphemeralNodePath =<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>        
ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, 
metaServerName.toString());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    
ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a 
name="line.107"></a>
+<span class="sourceLineNo">096</span>      metaServerName = 
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO);<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    RegionState metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertEquals("Wrong state for meta!", 
RegionState.State.OPEN, metaState.getState());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    assertNotEquals("Meta is on master!", 
metaServerName, master.getServerName());<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>    // Delete the ephemeral node of the 
meta-carrying region server.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    // This is trigger the expire of this 
region server on the master.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    String rsEphemeralNodePath =<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>        
ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, 
metaServerName.toString());<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    
ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    LOG.info("Deleted the znode for the 
RegionServer hosting hbase:meta; waiting on SSH");<a name="line.107"></a>
 <span class="sourceLineNo">108</span>    // Wait for SSH to finish<a 
name="line.108"></a>
 <span class="sourceLineNo">109</span>    final ServerManager serverManager = 
master.getServerManager();<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    final ServerName priorMetaServerName 
= metaServerName;<a name="line.110"></a>
@@ -123,39 +123,40 @@
 <span class="sourceLineNo">115</span>            &amp;&amp; 
!serverManager.areDeadServersInProgress();<a name="line.115"></a>
 <span class="sourceLineNo">116</span>      }<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    });<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">118</span>    LOG.info("Past wait on RIT");<a 
name="line.118"></a>
 <span class="sourceLineNo">119</span>    
TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.119"></a>
 <span class="sourceLineNo">120</span>    // Now, make sure meta is assigned<a 
name="line.120"></a>
 <span class="sourceLineNo">121</span>    assertTrue("Meta should be 
assigned",<a name="line.121"></a>
 <span class="sourceLineNo">122</span>      
regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.122"></a>
 <span class="sourceLineNo">123</span>    // Now, make sure meta is registered 
in zk<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    metaState = 
MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    assertEquals("Meta should be not in 
transition", RegionState.State.OPEN, metaState.getState());<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    assertEquals("Meta should be 
assigned", metaState.getServerName(),<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    assertNotEquals("Meta should be 
assigned on a different server",<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      metaState.getServerName(), 
metaServerName);<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>  public static class MyRegionServer 
extends MiniHBaseClusterRegionServer {<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    public MyRegionServer(Configuration 
conf) throws IOException, KeeperException,<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        InterruptedException {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      super(conf);<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>    @Override<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public void abort(String reason, 
Throwable cause) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      // sleep to slow down the region 
server abort<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      try {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        Thread.sleep(30*1000);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      } catch (InterruptedException e) 
{<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        return;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      super.abort(reason, cause);<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>}<a name="line.150"></a>
+<span class="sourceLineNo">125</span>    assertEquals("Meta should not be in 
transition", RegionState.State.OPEN,<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        metaState.getState());<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    assertEquals("Meta should be 
assigned", metaState.getServerName(),<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      
regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    assertNotEquals("Meta should be 
assigned on a different server",<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      metaState.getServerName(), 
metaServerName);<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>  public static class MyRegionServer 
extends MiniHBaseClusterRegionServer {<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    public MyRegionServer(Configuration 
conf) throws IOException, KeeperException,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        InterruptedException {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      super(conf);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    @Override<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    public void abort(String reason, 
Throwable cause) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      // sleep to slow down the region 
server abort<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        Thread.sleep(30*1000);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      } catch (InterruptedException e) 
{<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        return;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      super.abort(reason, cause);<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.html
index 687bfdf..401ddba 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.html
@@ -65,14 +65,14 @@
 <span class="sourceLineNo">057</span><a name="line.57"></a>
 <span class="sourceLineNo">058</span>  @Rule public TestName name = new 
TestName();<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Test(timeout=60000)<a 
name="line.60"></a>
+<span class="sourceLineNo">060</span>  @Test<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  public void testSimpleCreate() throws 
Exception {<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.62"></a>
 <span class="sourceLineNo">063</span>    final byte[][] splitKeys = null;<a 
name="line.63"></a>
 <span class="sourceLineNo">064</span>    testSimpleCreate(tableName, 
splitKeys);<a name="line.64"></a>
 <span class="sourceLineNo">065</span>  }<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  @Test(timeout=60000)<a 
name="line.67"></a>
+<span class="sourceLineNo">067</span>  @Test<a name="line.67"></a>
 <span class="sourceLineNo">068</span>  public void 
testSimpleCreateWithSplits() throws Exception {<a name="line.68"></a>
 <span class="sourceLineNo">069</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    final byte[][] splitKeys = new 
byte[][] {<a name="line.70"></a>
@@ -87,7 +87,7 @@
 <span class="sourceLineNo">079</span>    
MasterProcedureTestingUtility.validateTableCreation(getMaster(), tableName, 
regions, F1, F2);<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>  @Test(timeout=60000)<a 
name="line.82"></a>
+<span class="sourceLineNo">082</span>  @Test<a name="line.82"></a>
 <span class="sourceLineNo">083</span>  public void 
testCreateWithoutColumnFamily() throws Exception {<a name="line.83"></a>
 <span class="sourceLineNo">084</span>    final 
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.85"></a>
@@ -109,7 +109,7 @@
 <span class="sourceLineNo">101</span>        cause instanceof 
DoNotRetryIOException);<a name="line.101"></a>
 <span class="sourceLineNo">102</span>  }<a name="line.102"></a>
 <span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  @Test(timeout=60000, 
expected=TableExistsException.class)<a name="line.104"></a>
+<span class="sourceLineNo">104</span>  
@Test(expected=TableExistsException.class)<a name="line.104"></a>
 <span class="sourceLineNo">105</span>  public void testCreateExisting() throws 
Exception {<a name="line.105"></a>
 <span class="sourceLineNo">106</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.106"></a>
 <span class="sourceLineNo">107</span>    final 
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.107"></a>
@@ -132,7 +132,7 @@
 <span class="sourceLineNo">124</span>    latch2.await();<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>  @Test(timeout=60000)<a 
name="line.127"></a>
+<span class="sourceLineNo">127</span>  @Test<a name="line.127"></a>
 <span class="sourceLineNo">128</span>  public void 
testRecoveryAndDoubleExecution() throws Exception {<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.129"></a>
 <span class="sourceLineNo">130</span><a name="line.130"></a>
@@ -152,13 +152,13 @@
 <span class="sourceLineNo">144</span>    
MasterProcedureTestingUtility.validateTableCreation(getMaster(), tableName, 
regions, F1, F2);<a name="line.144"></a>
 <span class="sourceLineNo">145</span>  }<a name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>  @Test(timeout=90000)<a 
name="line.147"></a>
+<span class="sourceLineNo">147</span>  @Test<a name="line.147"></a>
 <span class="sourceLineNo">148</span>  public void 
testRollbackAndDoubleExecution() throws Exception {<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.149"></a>
 <span class="sourceLineNo">150</span>    
testRollbackAndDoubleExecution(TableDescriptorBuilder.newBuilder(MasterProcedureTestingUtility.createHTD(tableName,
 F1, F2)));<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>  @Test(timeout=90000)<a 
name="line.153"></a>
+<span class="sourceLineNo">153</span>  @Test<a name="line.153"></a>
 <span class="sourceLineNo">154</span>  public void 
testRollbackAndDoubleExecutionOnMobTable() throws Exception {<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    TableDescriptor htd = 
MasterProcedureTestingUtility.createHTD(tableName, F1, F2);<a 
name="line.156"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.CustomSplitPolicy.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.CustomSplitPolicy.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.CustomSplitPolicy.html
index 7b1e7f7..283bc56 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.CustomSplitPolicy.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.CustomSplitPolicy.html
@@ -998,7 +998,7 @@
 <span class="sourceLineNo">990</span>    }<a name="line.990"></a>
 <span class="sourceLineNo">991</span>  }<a name="line.991"></a>
 <span class="sourceLineNo">992</span><a name="line.992"></a>
-<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
RegionSplitPolicy {<a name="line.993"></a>
+<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
IncreasingToUpperBoundRegionSplitPolicy {<a name="line.993"></a>
 <span class="sourceLineNo">994</span><a name="line.994"></a>
 <span class="sourceLineNo">995</span>    @Override<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    protected boolean shouldSplit() {<a 
name="line.996"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.FailingSplitMasterObserver.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.FailingSplitMasterObserver.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.FailingSplitMasterObserver.html
index 7b1e7f7..283bc56 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.FailingSplitMasterObserver.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.FailingSplitMasterObserver.html
@@ -998,7 +998,7 @@
 <span class="sourceLineNo">990</span>    }<a name="line.990"></a>
 <span class="sourceLineNo">991</span>  }<a name="line.991"></a>
 <span class="sourceLineNo">992</span><a name="line.992"></a>
-<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
RegionSplitPolicy {<a name="line.993"></a>
+<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
IncreasingToUpperBoundRegionSplitPolicy {<a name="line.993"></a>
 <span class="sourceLineNo">994</span><a name="line.994"></a>
 <span class="sourceLineNo">995</span>    @Override<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    protected boolean shouldSplit() {<a 
name="line.996"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMaster.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMaster.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMaster.html
index 7b1e7f7..283bc56 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMaster.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMaster.html
@@ -998,7 +998,7 @@
 <span class="sourceLineNo">990</span>    }<a name="line.990"></a>
 <span class="sourceLineNo">991</span>  }<a name="line.991"></a>
 <span class="sourceLineNo">992</span><a name="line.992"></a>
-<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
RegionSplitPolicy {<a name="line.993"></a>
+<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
IncreasingToUpperBoundRegionSplitPolicy {<a name="line.993"></a>
 <span class="sourceLineNo">994</span><a name="line.994"></a>
 <span class="sourceLineNo">995</span>    @Override<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    protected boolean shouldSplit() {<a 
name="line.996"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMasterRpcServices.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMasterRpcServices.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMasterRpcServices.html
index 7b1e7f7..283bc56 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMasterRpcServices.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.MyMasterRpcServices.html
@@ -998,7 +998,7 @@
 <span class="sourceLineNo">990</span>    }<a name="line.990"></a>
 <span class="sourceLineNo">991</span>  }<a name="line.991"></a>
 <span class="sourceLineNo">992</span><a name="line.992"></a>
-<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
RegionSplitPolicy {<a name="line.993"></a>
+<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
IncreasingToUpperBoundRegionSplitPolicy {<a name="line.993"></a>
 <span class="sourceLineNo">994</span><a name="line.994"></a>
 <span class="sourceLineNo">995</span>    @Override<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    protected boolean shouldSplit() {<a 
name="line.996"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html
index 7b1e7f7..283bc56 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html
@@ -998,7 +998,7 @@
 <span class="sourceLineNo">990</span>    }<a name="line.990"></a>
 <span class="sourceLineNo">991</span>  }<a name="line.991"></a>
 <span class="sourceLineNo">992</span><a name="line.992"></a>
-<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
RegionSplitPolicy {<a name="line.993"></a>
+<span class="sourceLineNo">993</span>  static class CustomSplitPolicy extends 
IncreasingToUpperBoundRegionSplitPolicy {<a name="line.993"></a>
 <span class="sourceLineNo">994</span><a name="line.994"></a>
 <span class="sourceLineNo">995</span>    @Override<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    protected boolean shouldSplit() {<a 
name="line.996"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.html
index d2a218a..2e8f503 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.html
@@ -373,7 +373,7 @@
 <span class="sourceLineNo">365</span>    }<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>  @Test(timeout = 60 * 1000)<a 
name="line.368"></a>
+<span class="sourceLineNo">368</span>  @Test<a name="line.368"></a>
 <span class="sourceLineNo">369</span>  public void 
testVisibilityLabelsOnRSRestart() throws Exception {<a name="line.369"></a>
 <span class="sourceLineNo">370</span>    final TableName tableName = 
TableName.valueOf(TEST_NAME.getMethodName());<a name="line.370"></a>
 <span class="sourceLineNo">371</span>    List&lt;RegionServerThread&gt; 
regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.371"></a>

Reply via email to