You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/01/15 15:31:24 UTC

[02/30] hbase-site git commit: Published site at .

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e80e3339/testdevapidocs/src-html/org/apache/hadoop/hbase/TestZooKeeper.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestZooKeeper.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestZooKeeper.html
index 49cd7ba..6ba24e0 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestZooKeeper.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestZooKeeper.html
@@ -28,452 +28,273 @@
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import static org.junit.Assert.assertEquals;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static org.junit.Assert.assertFalse;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.assertNotNull;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.junit.Assert.assertNull;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import static org.junit.Assert.assertTrue;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import static org.junit.Assert.fail;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.IOException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.List;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Map;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.Put;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Result;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Table;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.master.LoadBalancer;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.zookeeper.EmptyWatcher;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.zookeeper.ZKConfig;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.zookeeper.CreateMode;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.zookeeper.KeeperException;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.zookeeper.ZooDefs;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.zookeeper.ZooKeeper;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.zookeeper.data.ACL;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.zookeeper.data.Stat;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.junit.After;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.AfterClass;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.Before;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.BeforeClass;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.Rule;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.junit.Test;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.junit.experimental.categories.Category;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.junit.rules.TestName;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.slf4j.Logger;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.slf4j.LoggerFactory;<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>@Category({MiscTests.class, LargeTests.class})<a name="line.71"></a>
-<span class="sourceLineNo">072</span>public class TestZooKeeper {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZooKeeper.class);<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  private final static HBaseTestingUtility<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      TEST_UTIL = new HBaseTestingUtility();<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  @Rule<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public TestName name = new TestName();<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>   * @throws java.lang.Exception<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  @BeforeClass<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static void setUpBeforeClass() throws Exception {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    // Test we can first start the ZK cluster by itself<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    Configuration conf = TEST_UTIL.getConfiguration();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    TEST_UTIL.startMiniDFSCluster(2);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    TEST_UTIL.startMiniZKCluster();<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 1000);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    conf.setClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, MockLoadBalancer.class,<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        LoadBalancer.class);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @throws java.lang.Exception<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  @AfterClass<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public static void tearDownAfterClass() throws Exception {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    TEST_UTIL.shutdownMiniCluster();<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>  /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @throws java.lang.Exception<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @Before<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public void setUp() throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    TEST_UTIL.startMiniHBaseCluster(2, 2);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  @After<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public void after() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Some regionserver could fail to delete its znode.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      // So shutdown could hang. Let's kill them all instead.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      TEST_UTIL.getHBaseCluster().killAll();<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>      // Still need to clean things up<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      TEST_UTIL.shutdownMiniHBaseCluster();<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    } finally {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      TEST_UTIL.getTestFileSystem().delete(FSUtils.getRootDir(TEST_UTIL.getConfiguration()), true);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      ZKUtil.deleteNodeRecursively(TEST_UTIL.getZooKeeperWatcher(), "/hbase");<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  @Test (timeout = 120000)<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void testRegionServerSessionExpired() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    LOG.info("Starting " + name.getMethodName());<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    TEST_UTIL.expireRegionServerSession(0);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    testSanity(name.getMethodName());<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>  @Test(timeout = 300000)<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public void testMasterSessionExpired() throws Exception {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    LOG.info("Starting " + name.getMethodName());<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    TEST_UTIL.expireMasterSession();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    testSanity(name.getMethodName());<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   * Master recovery when the znode already exists. Internally, this<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   *  test differs from {@link #testMasterSessionExpired} because here<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   *  the master znode will exist in ZK.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  @Test(timeout = 300000)<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  public void testMasterZKSessionRecoveryFailure() throws Exception {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    LOG.info("Starting " + name.getMethodName());<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    HMaster m = cluster.getMaster();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    m.abort("Test recovery from zk session expired",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        new KeeperException.SessionExpiredException());<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    testSanity(name.getMethodName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>  /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span>   * Make sure we can use the cluster<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   * @throws Exception<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  private void testSanity(final String testName) throws Exception{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    String tableName = testName + "_" + System.currentTimeMillis();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    HColumnDescriptor family = new HColumnDescriptor("fam");<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    desc.addFamily(family);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    LOG.info("Creating table " + tableName);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    try {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      admin.createTable(desc);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    } finally {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      admin.close();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    Table table = TEST_UTIL.getConnection().getTable(desc.getTableName());<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    Put put = new Put(Bytes.toBytes("testrow"));<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    put.addColumn(Bytes.toBytes("fam"), Bytes.toBytes("col"), Bytes.toBytes("testdata"));<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    LOG.info("Putting table " + tableName);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    table.put(put);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    table.close();<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<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>   * Create a znode with data<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * @throws Exception<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @Test<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public void testCreateWithParents() throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    ZKWatcher zkw =<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        new ZKWatcher(new Configuration(TEST_UTIL.getConfiguration()),<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            TestZooKeeper.class.getName(), null);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    byte[] expectedData = new byte[] { 1, 2, 3 };<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    ZKUtil.createWithParents(zkw, "/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    byte[] data = ZKUtil.getData(zkw, "/l1/l2/l3/l4/testCreateWithParents");<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    ZKUtil.deleteNodeRecursively(zkw, "/l1");<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    ZKUtil.createWithParents(zkw, "/testCreateWithParents", expectedData);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    data = ZKUtil.getData(zkw, "/testCreateWithParents");<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    ZKUtil.deleteNodeRecursively(zkw, "/testCreateWithParents");<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<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>   * Create a bunch of znodes in a hierarchy, try deleting one that has childs (it will fail), then<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * delete it recursively, then delete the last znode<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @throws Exception<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  @Test<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public void testZNodeDeletes() throws Exception {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    ZKWatcher zkw = new ZKWatcher(<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      new Configuration(TEST_UTIL.getConfiguration()),<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      TestZooKeeper.class.getName(), null);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    ZKUtil.createWithParents(zkw, "/l1/l2/l3/l4");<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    try {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      ZKUtil.deleteNode(zkw, "/l1/l2");<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      fail("We should not be able to delete if znode has childs");<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    } catch (KeeperException ex) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      assertNotNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null));<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    ZKUtil.deleteNodeRecursively(zkw, "/l1/l2");<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    // make sure it really is deleted<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null));<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>    // do the same delete again and make sure it doesn't crash<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    ZKUtil.deleteNodeRecursively(zkw, "/l1/l2");<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>    ZKUtil.deleteNode(zkw, "/l1");<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2", null));<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>  /**<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * A test for HBASE-3238<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @throws IOException A connection attempt to zk failed<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @throws InterruptedException One of the non ZKUtil actions was interrupted<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * @throws KeeperException Any of the zookeeper connections had a<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * KeeperException<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  @Test<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  public void testCreateSilentIsReallySilent() throws InterruptedException,<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      KeeperException, IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    Configuration c = TEST_UTIL.getConfiguration();<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    String aclZnode = "/aclRoot";<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    String quorumServers = ZKConfig.getZKQuorumServersString(c);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    int sessionTimeout = 5 * 1000; // 5 seconds<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    zk.addAuthInfo("digest", "hbase:rox".getBytes());<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>    // Assumes the  root of the ZooKeeper space is writable as it creates a node<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // wherever the cluster home is defined.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    ZKWatcher zk2 = new ZKWatcher(TEST_UTIL.getConfiguration(),<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      "testCreateSilentIsReallySilent", null);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>    // Save the previous ACL<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    Stat s =  null;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    List&lt;ACL&gt; oldACL = null;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    while (true) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        s = new Stat();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        oldACL = zk.getACL("/", s);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        break;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      } catch (KeeperException e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        switch (e.code()) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>          case CONNECTIONLOSS:<a name="line.263"></a>
-<span class="sourceLineNo">264</span>          case SESSIONEXPIRED:<a name="line.264"></a>
-<span class="sourceLineNo">265</span>          case OPERATIONTIMEOUT:<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            LOG.warn("Possibly transient ZooKeeper exception", e);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            Threads.sleep(100);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            break;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>         default:<a name="line.269"></a>
-<span class="sourceLineNo">270</span>            throw e;<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><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    // I set this acl after the attempted creation of the cluster home node.<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    // Add retries in case of retryable zk exceptions.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    while (true) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      try {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        break;<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      } catch (KeeperException e) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        switch (e.code()) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>          case CONNECTIONLOSS:<a name="line.283"></a>
-<span class="sourceLineNo">284</span>          case SESSIONEXPIRED:<a name="line.284"></a>
-<span class="sourceLineNo">285</span>          case OPERATIONTIMEOUT:<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>            Threads.sleep(100);<a name="line.287"></a>
-<span class="sourceLineNo">288</span>            break;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         default:<a name="line.289"></a>
-<span class="sourceLineNo">290</span>            throw e;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      }<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>    while (true) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      try {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        zk.create(aclZnode, null, ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        break;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      } catch (KeeperException e) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        switch (e.code()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          case CONNECTIONLOSS:<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          case SESSIONEXPIRED:<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          case OPERATIONTIMEOUT:<a name="line.303"></a>
-<span class="sourceLineNo">304</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            Threads.sleep(100);<a name="line.305"></a>
-<span class="sourceLineNo">306</span>            break;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>         default:<a name="line.307"></a>
-<span class="sourceLineNo">308</span>            throw e;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    zk.close();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    ZKUtil.createAndFailSilent(zk2, aclZnode);<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    // Restore the ACL<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    ZooKeeper zk3 = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    zk3.addAuthInfo("digest", "hbase:rox".getBytes());<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    try {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      zk3.setACL("/", oldACL, -1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    } finally {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      zk3.close();<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * Test should not fail with NPE when getChildDataAndWatchForNewChildren<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   * invoked with wrongNode<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @Test<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @SuppressWarnings("deprecation")<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE()<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      throws Exception {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    ZKWatcher zkw = new ZKWatcher(TEST_UTIL.getConfiguration(), name.getMethodName(), null);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    ZKUtil.getChildDataAndWatchForNewChildren(zkw, "/wrongNode");<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  }<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>   * Tests that the master does not call retainAssignment after recovery from expired zookeeper<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   * session. Without the HBASE-6046 fix master always tries to assign all the user regions by<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * calling retainAssignment.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  @Test(timeout = 300000)<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Exception {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    cluster.startRegionServer();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    cluster.waitForActiveAndReadyMaster(10000);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    HMaster m = cluster.getMaster();<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    final ZKWatcher zkw = m.getZooKeeper();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    // now the cluster is up. So assign some regions.<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    try (Admin admin = TEST_UTIL.getAdmin()) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("a"), Bytes.toBytes("b"),<a name="line.351"></a>
-<span class="sourceLineNo">352</span>          Bytes.toBytes("c"), Bytes.toBytes("d"), Bytes.toBytes("e"), Bytes.toBytes("f"),<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          Bytes.toBytes("g"), Bytes.toBytes("h"), Bytes.toBytes("i"), Bytes.toBytes("j") };<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName()));<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      admin.createTable(htd, SPLIT_KEYS);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      m.getZooKeeper().close();<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      MockLoadBalancer.retainAssignCalled = false;<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      final int expectedNumOfListeners = countPermanentListeners(zkw);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      m.abort("Test recovery from zk session expired",<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          new KeeperException.SessionExpiredException());<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      // The recovered master should not call retainAssignment, as it is not a<a name="line.364"></a>
-<span class="sourceLineNo">365</span>      // clean startup.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      assertFalse("Retain assignment should not be called", MockLoadBalancer.retainAssignCalled);<a name="line.366"></a>
-<span class="sourceLineNo">367</span>      // number of listeners should be same as the value before master aborted<a name="line.367"></a>
-<span class="sourceLineNo">368</span>      // wait for new master is initialized<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      cluster.waitForActiveAndReadyMaster(120000);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      final HMaster newMaster = cluster.getMasterThread().getMaster();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      assertEquals(expectedNumOfListeners, countPermanentListeners(newMaster.getZooKeeper()));<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>  /**<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   * Count listeners in zkw excluding listeners, that belongs to workers or other<a name="line.376"></a>
-<span class="sourceLineNo">377</span>   * temporary processes.<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>  private int countPermanentListeners(ZKWatcher watcher) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    return countListeners(watcher, ZkSplitLogWorkerCoordination.class);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<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>   * Count listeners in zkw excluding provided classes<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   */<a name="line.385"></a>
-<span class="sourceLineNo">386</span>  private int countListeners(ZKWatcher watcher, Class&lt;?&gt;... exclude) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    int cnt = 0;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    for (Object o : watcher.getListeners()) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      boolean skip = false;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      for (Class&lt;?&gt; aClass : exclude) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>        if (aClass.isAssignableFrom(o.getClass())) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>          skip = true;<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          break;<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      }<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (!skip) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        cnt += 1;<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      }<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    return cnt;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>  }<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span>  /**<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   * Tests whether the logs are split when master recovers from a expired zookeeper session and an<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   * RS goes down.<a name="line.405"></a>
-<span class="sourceLineNo">406</span>   */<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  @Test(timeout = 300000)<a name="line.407"></a>
-<span class="sourceLineNo">408</span>  public void testLogSplittingAfterMasterRecoveryDueToZKExpiry() throws Exception {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    cluster.startRegionServer();<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    HMaster m = cluster.getMaster();<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    // now the cluster is up. So assign some regions.<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    Table table = null;<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    try {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("1"), Bytes.toBytes("2"),<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        Bytes.toBytes("3"), Bytes.toBytes("4"), Bytes.toBytes("5") };<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>      HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName()));<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      HColumnDescriptor hcd = new HColumnDescriptor("col");<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      htd.addFamily(hcd);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      admin.createTable(htd, SPLIT_KEYS);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>      table = TEST_UTIL.getConnection().getTable(htd.getTableName());<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      Put p;<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      int numberOfPuts;<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      for (numberOfPuts = 0; numberOfPuts &lt; 6; numberOfPuts++) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        p = new Put(Bytes.toBytes(numberOfPuts));<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        p.addColumn(Bytes.toBytes("col"), Bytes.toBytes("ql"),<a name="line.429"></a>
-<span class="sourceLineNo">430</span>                Bytes.toBytes("value" + numberOfPuts));<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        table.put(p);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      m.getZooKeeper().close();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      m.abort("Test recovery from zk session expired",<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        new KeeperException.SessionExpiredException());<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      cluster.getRegionServer(0).abort("Aborting");<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      // Without patch for HBASE-6046 this test case will always timeout<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      // with patch the test case should pass.<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      Scan scan = new Scan();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      int numberOfRows = 0;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      ResultScanner scanner = table.getScanner(scan);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      Result[] result = scanner.next(1);<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      while (result != null &amp;&amp; result.length &gt; 0) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        numberOfRows++;<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        result = scanner.next(1);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      assertEquals("Number of rows should be equal to number of puts.", numberOfPuts,<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        numberOfRows);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    } finally {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      if (table != null) table.close();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      admin.close();<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    }<a name="line.453"></a>
-<span class="sourceLineNo">454</span>  }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span>  static class MockLoadBalancer extends SimpleLoadBalancer {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    static boolean retainAssignCalled = false;<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    public Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; retainAssignment(<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        Map&lt;RegionInfo, ServerName&gt; regions, List&lt;ServerName&gt; servers) throws HBaseIOException {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      retainAssignCalled = true;<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      return super.retainAssignment(regions, servers);<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><a name="line.466"></a>
-<span class="sourceLineNo">467</span>}<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.assertTrue;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.List;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.Put;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.Result;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Table;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.master.LoadBalancer;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.zookeeper.KeeperException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.After;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.AfterClass;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Before;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.BeforeClass;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Rule;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.Test;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.experimental.categories.Category;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.rules.TestName;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.Logger;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.slf4j.LoggerFactory;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>@Category({MiscTests.class, LargeTests.class})<a name="line.60"></a>
+<span class="sourceLineNo">061</span>public class TestZooKeeper {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZooKeeper.class);<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  @Rule<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public TestName name = new TestName();<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @BeforeClass<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public static void setUpBeforeClass() throws Exception {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // Test we can first start the ZK cluster by itself<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    Configuration conf = TEST_UTIL.getConfiguration();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    TEST_UTIL.startMiniDFSCluster(2);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    TEST_UTIL.startMiniZKCluster();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 1000);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    conf.setClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, MockLoadBalancer.class,<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        LoadBalancer.class);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  @AfterClass<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public static void tearDownAfterClass() throws Exception {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    TEST_UTIL.shutdownMiniCluster();<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>  @Before<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public void setUp() throws Exception {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    TEST_UTIL.startMiniHBaseCluster(2, 2);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @After<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public void after() throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    try {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      // Some regionserver could fail to delete its znode.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      // So shutdown could hang. Let's kill them all instead.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      TEST_UTIL.getHBaseCluster().killAll();<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>      // Still need to clean things up<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      TEST_UTIL.shutdownMiniHBaseCluster();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    } finally {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      TEST_UTIL.getTestFileSystem().delete(FSUtils.getRootDir(TEST_UTIL.getConfiguration()), true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      ZKUtil.deleteNodeRecursively(TEST_UTIL.getZooKeeperWatcher(), "/hbase");<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><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Test (timeout = 120000)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public void testRegionServerSessionExpired() throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    LOG.info("Starting " + name.getMethodName());<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    TEST_UTIL.expireRegionServerSession(0);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    testSanity(name.getMethodName());<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  @Test(timeout = 300000)<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public void testMasterSessionExpired() throws Exception {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    LOG.info("Starting " + name.getMethodName());<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    TEST_UTIL.expireMasterSession();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    testSanity(name.getMethodName());<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">119</span>  /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * Master recovery when the znode already exists. Internally, this<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   *  test differs from {@link #testMasterSessionExpired} because here<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   *  the master znode will exist in ZK.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  @Test(timeout = 300000)<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public void testMasterZKSessionRecoveryFailure() throws Exception {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    LOG.info("Starting " + name.getMethodName());<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    HMaster m = cluster.getMaster();<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    m.abort("Test recovery from zk session expired",<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        new KeeperException.SessionExpiredException());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    testSanity(name.getMethodName());<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<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>   * Make sure we can use the cluster<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  private void testSanity(final String testName) throws Exception {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    String tableName = testName + "_" + System.currentTimeMillis();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    TableDescriptor desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName))<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        .addColumnFamily(ColumnFamilyDescriptorBuilder.of("fam")).build();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    LOG.info("Creating table " + tableName);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      admin.createTable(desc);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    } finally {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      admin.close();<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>    Table table = TEST_UTIL.getConnection().getTable(desc.getTableName());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    Put put = new Put(Bytes.toBytes("testrow"));<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    put.addColumn(Bytes.toBytes("fam"), Bytes.toBytes("col"), Bytes.toBytes("testdata"));<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    LOG.info("Putting table " + tableName);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    table.put(put);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    table.close();<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>  /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   * Tests that the master does not call retainAssignment after recovery from expired zookeeper<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   * session. Without the HBASE-6046 fix master always tries to assign all the user regions by<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   * calling retainAssignment.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  @Test(timeout = 300000)<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Exception {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    cluster.startRegionServer();<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    cluster.waitForActiveAndReadyMaster(10000);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    HMaster m = cluster.getMaster();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    final ZKWatcher zkw = m.getZooKeeper();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // now the cluster is up. So assign some regions.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    try (Admin admin = TEST_UTIL.getAdmin()) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("a"), Bytes.toBytes("b"),<a name="line.172"></a>
+<span class="sourceLineNo">173</span>          Bytes.toBytes("c"), Bytes.toBytes("d"), Bytes.toBytes("e"), Bytes.toBytes("f"),<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          Bytes.toBytes("g"), Bytes.toBytes("h"), Bytes.toBytes("i"), Bytes.toBytes("j") };<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      TableDescriptor htd =<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.176"></a>
+<span class="sourceLineNo">177</span>              .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      admin.createTable(htd, SPLIT_KEYS);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      m.getZooKeeper().close();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      MockLoadBalancer.retainAssignCalled = false;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      final int expectedNumOfListeners = countPermanentListeners(zkw);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m.abort("Test recovery from zk session expired",<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          new KeeperException.SessionExpiredException());<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      // The recovered master should not call retainAssignment, as it is not a<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      // clean startup.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      assertFalse("Retain assignment should not be called", MockLoadBalancer.retainAssignCalled);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      // number of listeners should be same as the value before master aborted<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      // wait for new master is initialized<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      cluster.waitForActiveAndReadyMaster(120000);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      final HMaster newMaster = cluster.getMasterThread().getMaster();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      assertEquals(expectedNumOfListeners, countPermanentListeners(newMaster.getZooKeeper()));<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>   * Count listeners in zkw excluding listeners, that belongs to workers or other<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * temporary processes.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  private int countPermanentListeners(ZKWatcher watcher) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    return countListeners(watcher, ZkSplitLogWorkerCoordination.class);<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>  /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * Count listeners in zkw excluding provided classes<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  private int countListeners(ZKWatcher watcher, Class&lt;?&gt;... exclude) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    int cnt = 0;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    for (Object o : watcher.getListeners()) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      boolean skip = false;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      for (Class&lt;?&gt; aClass : exclude) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        if (aClass.isAssignableFrom(o.getClass())) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          skip = true;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>          break;<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>      if (!skip) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        cnt += 1;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    return cnt;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * Tests whether the logs are split when master recovers from a expired zookeeper session and an<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * RS goes down.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   */<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  @Test(timeout = 300000)<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public void testLogSplittingAfterMasterRecoveryDueToZKExpiry() throws Exception {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    cluster.startRegionServer();<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    HMaster m = cluster.getMaster();<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    // now the cluster is up. So assign some regions.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    Admin admin = TEST_UTIL.getAdmin();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    Table table = null;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("1"), Bytes.toBytes("2"),<a name="line.238"></a>
+<span class="sourceLineNo">239</span>          Bytes.toBytes("3"), Bytes.toBytes("4"), Bytes.toBytes("5") };<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      TableDescriptor htd =<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.241"></a>
+<span class="sourceLineNo">242</span>              .addColumnFamily(ColumnFamilyDescriptorBuilder.of("col")).build();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      admin.createTable(htd, SPLIT_KEYS);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      table = TEST_UTIL.getConnection().getTable(htd.getTableName());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      Put p;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      int numberOfPuts;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      for (numberOfPuts = 0; numberOfPuts &lt; 6; numberOfPuts++) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        p = new Put(Bytes.toBytes(numberOfPuts));<a name="line.249"></a>
+<span class="sourceLineNo">250</span>        p.addColumn(Bytes.toBytes("col"), Bytes.toBytes("ql"),<a name="line.250"></a>
+<span class="sourceLineNo">251</span>                Bytes.toBytes("value" + numberOfPuts));<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        table.put(p);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      m.getZooKeeper().close();<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      m.abort("Test recovery from zk session expired",<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        new KeeperException.SessionExpiredException());<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      assertTrue(m.isStopped()); // Master doesn't recover any more<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      cluster.getRegionServer(0).abort("Aborting");<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      // Without patch for HBASE-6046 this test case will always timeout<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      // with patch the test case should pass.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      Scan scan = new Scan();<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      int numberOfRows = 0;<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      ResultScanner scanner = table.getScanner(scan);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      Result[] result = scanner.next(1);<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      while (result != null &amp;&amp; result.length &gt; 0) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>        numberOfRows++;<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        result = scanner.next(1);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      assertEquals("Number of rows should be equal to number of puts.", numberOfPuts,<a name="line.269"></a>
+<span class="sourceLineNo">270</span>        numberOfRows);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    } finally {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      if (table != null) table.close();<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      admin.close();<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><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  static class MockLoadBalancer extends SimpleLoadBalancer {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    static boolean retainAssignCalled = false;<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    @Override<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    public Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; retainAssignment(<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        Map&lt;RegionInfo, ServerName&gt; regions, List&lt;ServerName&gt; servers) throws HBaseIOException {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      retainAssignCalled = true;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      return super.retainAssignment(regions, servers);<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><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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e80e3339/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.MockRegionStateStore.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.MockRegionStateStore.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.MockRegionStateStore.html
index b33ff89..81ed069 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.MockRegionStateStore.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.MockRegionStateStore.html
@@ -111,7 +111,7 @@
 <span class="sourceLineNo">103</span>    super(conf);<a name="line.103"></a>
 <span class="sourceLineNo">104</span>    this.regionsToRegionServers = regionsToRegionServers;<a name="line.104"></a>
 <span class="sourceLineNo">105</span>    Superusers.initialize(conf);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    this.fileSystemManager = new MasterFileSystem(this);<a name="line.106"></a>
+<span class="sourceLineNo">106</span>    this.fileSystemManager = new MasterFileSystem(conf);<a name="line.106"></a>
 <span class="sourceLineNo">107</span>    this.walManager = new MasterWalManager(this);<a name="line.107"></a>
 <span class="sourceLineNo">108</span>    // Mock an AM.<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    this.assignmentManager = new AssignmentManager(this, new MockRegionStateStore(this)) {<a name="line.109"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e80e3339/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.html
index b33ff89..81ed069 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MockMasterServices.html
@@ -111,7 +111,7 @@
 <span class="sourceLineNo">103</span>    super(conf);<a name="line.103"></a>
 <span class="sourceLineNo">104</span>    this.regionsToRegionServers = regionsToRegionServers;<a name="line.104"></a>
 <span class="sourceLineNo">105</span>    Superusers.initialize(conf);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    this.fileSystemManager = new MasterFileSystem(this);<a name="line.106"></a>
+<span class="sourceLineNo">106</span>    this.fileSystemManager = new MasterFileSystem(conf);<a name="line.106"></a>
 <span class="sourceLineNo">107</span>    this.walManager = new MasterWalManager(this);<a name="line.107"></a>
 <span class="sourceLineNo">108</span>    // Mock an AM.<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    this.assignmentManager = new AssignmentManager(this, new MockRegionStateStore(this)) {<a name="line.109"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e80e3339/testdevapidocs/src-html/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.html
index b29f494..7ecf601 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.html
@@ -167,7 +167,7 @@
 <span class="sourceLineNo">159</span>  private void checkZnodePermsRecursive(ZKWatcher watcher,<a name="line.159"></a>
 <span class="sourceLineNo">160</span>      RecoverableZooKeeper zk, String znode) throws KeeperException, InterruptedException {<a name="line.160"></a>
 <span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    boolean expectedWorldReadable = watcher.isClientReadable(znode);<a name="line.162"></a>
+<span class="sourceLineNo">162</span>    boolean expectedWorldReadable = watcher.znodePaths.isClientReadable(znode);<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
 <span class="sourceLineNo">164</span>    assertZnodePerms(zk, znode, expectedWorldReadable);<a name="line.164"></a>
 <span class="sourceLineNo">165</span><a name="line.165"></a>