[01/19] hbase-site git commit: Published site at 7a1d00c7a0719ccb8d97b42965835f124ef27804.

[git-site-role]

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 8fdbf64ca -> b4aaf75ce


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b4aaf75c/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
index 000aba8..20b895e 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
@@ -25,220 +25,245 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.zookeeper;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertNotNull;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertNull;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.List;<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.Abortable;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseZKTestingUtility;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.zookeeper.CreateMode;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.zookeeper.KeeperException;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.zookeeper.ZooDefs;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.zookeeper.ZooKeeper;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.zookeeper.data.ACL;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.zookeeper.data.Stat;<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>import org.slf4j.Logger;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a 
name="line.49"></a>
+<span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertEquals;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertNull;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static 
org.junit.Assert.assertTrue;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.fail;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.IOException;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.List;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseZKTestingUtility;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.zookeeper.CreateMode;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.zookeeper.KeeperException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.zookeeper.ZooDefs;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.zookeeper.ZooKeeper;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.zookeeper.data.ACL;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.zookeeper.data.Stat;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.AfterClass;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.BeforeClass;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Test;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.junit.experimental.categories.Category;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a 
name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>@Category({ ZKTests.class, 
MediumTests.class })<a name="line.51"></a>
-<span class="sourceLineNo">052</span>public class TestZKUtil {<a 
name="line.52"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a 
name="line.52"></a>
 <span class="sourceLineNo">053</span><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(TestZKUtil.class);<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKUtil.class);<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static HBaseZKTestingUtility 
UTIL = new HBaseZKTestingUtility();<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static ZKWatcher ZKW;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @BeforeClass<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static void setUp() throws 
Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    
UTIL.startMiniZKCluster().getClientPort();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    ZKW = new ZKWatcher(new 
Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>        new WarnOnlyAbortable());<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>  @AfterClass<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static void tearDown() throws 
IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    Closeables.close(ZKW, true);<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    UTIL.shutdownMiniZKCluster();<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    UTIL.cleanupTestDir();<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<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>   * Create a znode with data<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  @Test<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  public void testCreateWithParents() 
throws KeeperException, InterruptedException {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    byte[] expectedData = new byte[] { 1, 
2, 3 };<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    byte[] data = ZKUtil.getData(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents");<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1");<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    ZKUtil.createWithParents(ZKW, 
"/testCreateWithParents", expectedData);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    data = ZKUtil.getData(ZKW, 
"/testCreateWithParents");<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/testCreateWithParents");<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>  /**<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * Create a bunch of znodes in a 
hierarchy, try deleting one that has childs (it will fail), then<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>   * delete it recursively, then delete 
the last znode<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   */<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void testZNodeDeletes() throws 
Exception {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4");<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    try {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>      fail("We should not be able to 
delete if znode has childs");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    } catch (KeeperException ex) {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      
assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    // make sure it really is deleted<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2/l3/l4", null));<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>    // do the same delete again and make 
sure it doesn't crash<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.114"></a>
+<span class="sourceLineNo">054</span>@Category({ ZKTests.class, 
MediumTests.class })<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class TestZKUtil {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @ClassRule<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      
HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKUtil.class);<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  private static HBaseZKTestingUtility 
UTIL = new HBaseZKTestingUtility();<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static ZKWatcher ZKW;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  @BeforeClass<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public static void setUp() throws 
Exception {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    
UTIL.startMiniZKCluster().getClientPort();<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    ZKW = new ZKWatcher(new 
Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>        new WarnOnlyAbortable());<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  @AfterClass<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public static void tearDown() throws 
IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    Closeables.close(ZKW, true);<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    UTIL.shutdownMiniZKCluster();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    UTIL.cleanupTestDir();<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * Create a znode with data<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  @Test<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public void testCreateWithParents() 
throws KeeperException, InterruptedException {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    byte[] expectedData = new byte[] { 1, 
2, 3 };<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    byte[] data = ZKUtil.getData(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents");<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1");<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>    ZKUtil.createWithParents(ZKW, 
"/testCreateWithParents", expectedData);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    data = ZKUtil.getData(ZKW, 
"/testCreateWithParents");<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/testCreateWithParents");<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Create a bunch of znodes in a 
hierarchy, try deleting one that has childs (it will fail), then<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>   * delete it recursively, then delete 
the last znode<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  @Test<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  public void testZNodeDeletes() throws 
Exception {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4");<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    try {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      fail("We should not be able to 
delete if znode has childs");<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    } catch (KeeperException ex) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      
assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    // make sure it really is deleted<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2/l3/l4", null));<a name="line.114"></a>
 <span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>    ZKUtil.deleteNode(ZKW, "/l1");<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2", null));<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>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * A test for HBASE-3238<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @throws IOException A connection 
attempt to zk failed<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @throws InterruptedException One of 
the non ZKUtil actions was interrupted<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   * @throws KeeperException Any of the 
zookeeper connections had a KeeperException<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void 
testCreateSilentIsReallySilent()<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      throws InterruptedException, 
KeeperException, IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    Configuration c = 
UTIL.getConfiguration();<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    String aclZnode = "/aclRoot";<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    String quorumServers = 
ZKConfig.getZKQuorumServersString(c);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    int sessionTimeout = 5 * 1000; // 5 
seconds<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    ZooKeeper zk = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    zk.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    // Save the previous ACL<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    Stat s = null;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    List&lt;ACL&gt; oldACL = null;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    while (true) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      try {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        s = new Stat();<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>        oldACL = zk.getACL("/", s);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>        break;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      } catch (KeeperException e) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>        switch (e.code()) {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>          case CONNECTIONLOSS:<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>          case SESSIONEXPIRED:<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>          case OPERATIONTIMEOUT:<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>            LOG.warn("Possibly transient 
ZooKeeper exception", e);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            Threads.sleep(100);<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>            break;<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          default:<a name="line.153"></a>
-<span class="sourceLineNo">154</span>            throw e;<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>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    // I set this acl after the attempted 
creation of the cluster home node.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    // Add retries in case of retryable 
zk exceptions.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    while (true) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      try {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        zk.setACL("/", 
ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        break;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      } catch (KeeperException e) {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>        switch (e.code()) {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>          case CONNECTIONLOSS:<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>          case SESSIONEXPIRED:<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>          case OPERATIONTIMEOUT:<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>            Threads.sleep(100);<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>            break;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>          default:<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            throw e;<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>    while (true) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      try {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        zk.create(aclZnode, null, 
ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        break;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      } catch (KeeperException e) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>        switch (e.code()) {<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>          case CONNECTIONLOSS:<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>          case SESSIONEXPIRED:<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>          case OPERATIONTIMEOUT:<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            Threads.sleep(100);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>            break;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>          default:<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            throw e;<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>        }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    zk.close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    ZKUtil.createAndFailSilent(ZKW, 
aclZnode);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // Restore the ACL<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    ZooKeeper zk3 = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    zk3.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    try {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      zk3.setACL("/", oldACL, -1);<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    } finally {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      zk3.close();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * Test should not fail with NPE when 
getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   */<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Test<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  @SuppressWarnings("deprecation")<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>  public void 
testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    
ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<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>  private static class WarnOnlyAbortable 
implements Abortable {<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>    @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    public void abort(String why, 
Throwable e) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      LOG.warn("ZKWatcher received abort, 
ignoring.  Reason: " + why);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      if (LOG.isDebugEnabled()) {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>        LOG.debug(e.toString(), e);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>    @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    public boolean isAborted() {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>      return false;<a name="line.230"></a>
+<span class="sourceLineNo">116</span>    // do the same delete again and make 
sure it doesn't crash<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    ZKUtil.deleteNode(ZKW, "/l1");<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2", null));<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  private int getZNodeDataVersion(String 
znode) throws KeeperException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Stat stat = new Stat();<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    ZKUtil.getDataNoWatch(ZKW, znode, 
stat);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return stat.getVersion();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>  @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  public void testSetDataWithVersion() 
throws Exception {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    ZKUtil.createWithParents(ZKW, 
"/s1/s2/s3");<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    int v0 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    assertEquals(0, v0);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", 
Bytes.toBytes(12L));<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    int v1 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    assertEquals(1, v1);<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>    ZKUtil.multiOrSequential(ZKW,<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      
ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), 
false);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    int v2 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    assertEquals(2, v2);<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * A test for HBASE-3238<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>   * @throws IOException A connection 
attempt to zk failed<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * @throws InterruptedException One of 
the non ZKUtil actions was interrupted<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @throws KeeperException Any of the 
zookeeper connections had a KeeperException<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Test<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void 
testCreateSilentIsReallySilent()<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      throws InterruptedException, 
KeeperException, IOException {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    Configuration c = 
UTIL.getConfiguration();<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>    String aclZnode = "/aclRoot";<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    String quorumServers = 
ZKConfig.getZKQuorumServersString(c);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    int sessionTimeout = 5 * 1000; // 5 
seconds<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    ZooKeeper zk = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    zk.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // Save the previous ACL<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>    Stat s = null;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    List&lt;ACL&gt; oldACL = null;<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>    while (true) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      try {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        s = new Stat();<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>        oldACL = zk.getACL("/", s);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>        break;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      } catch (KeeperException e) {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>        switch (e.code()) {<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>          case CONNECTIONLOSS:<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>          case SESSIONEXPIRED:<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>          case OPERATIONTIMEOUT:<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>            LOG.warn("Possibly transient 
ZooKeeper exception", e);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            Threads.sleep(100);<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>            break;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          default:<a name="line.178"></a>
+<span class="sourceLineNo">179</span>            throw e;<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>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // I set this acl after the attempted 
creation of the cluster home node.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    // Add retries in case of retryable 
zk exceptions.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    while (true) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      try {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        zk.setACL("/", 
ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        break;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      } catch (KeeperException e) {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>        switch (e.code()) {<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>          case CONNECTIONLOSS:<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>          case SESSIONEXPIRED:<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>          case OPERATIONTIMEOUT:<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            Threads.sleep(100);<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>            break;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          default:<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            throw e;<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><a name="line.203"></a>
+<span class="sourceLineNo">204</span>    while (true) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      try {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        zk.create(aclZnode, null, 
ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        break;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      } catch (KeeperException e) {<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>        switch (e.code()) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>          case CONNECTIONLOSS:<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>          case SESSIONEXPIRED:<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>          case OPERATIONTIMEOUT:<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            Threads.sleep(100);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>            break;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          default:<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            throw e;<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>        }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    zk.close();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    ZKUtil.createAndFailSilent(ZKW, 
aclZnode);<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    // Restore the ACL<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    ZooKeeper zk3 = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    zk3.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      zk3.setACL("/", oldACL, -1);<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>    } finally {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      zk3.close();<a name="line.230"></a>
 <span class="sourceLineNo">231</span>    }<a name="line.231"></a>
 <span class="sourceLineNo">232</span>  }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>}<a name="line.233"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>  /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * Test should not fail with NPE when 
getChildDataAndWatchForNewChildren invoked with wrongNode<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>  @SuppressWarnings("deprecation")<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>  public void 
testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    
ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>  }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>  private static class WarnOnlyAbortable 
implements Abortable {<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    @Override<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    public void abort(String why, 
Throwable e) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      LOG.warn("ZKWatcher received abort, 
ignoring.  Reason: " + why);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      if (LOG.isDebugEnabled()) {<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        LOG.debug(e.toString(), e);<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    @Override<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    public boolean isAborted() {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      return false;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>}<a name="line.258"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b4aaf75c/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
index 000aba8..20b895e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
@@ -25,220 +25,245 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.zookeeper;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertNotNull;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertNull;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.List;<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.Abortable;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseZKTestingUtility;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.zookeeper.CreateMode;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.zookeeper.KeeperException;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.zookeeper.ZooDefs;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.zookeeper.ZooKeeper;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.zookeeper.data.ACL;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.zookeeper.data.Stat;<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>import org.slf4j.Logger;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a 
name="line.49"></a>
+<span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertEquals;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertNull;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static 
org.junit.Assert.assertTrue;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.fail;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.IOException;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.List;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseZKTestingUtility;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.zookeeper.CreateMode;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.zookeeper.KeeperException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.zookeeper.ZooDefs;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.zookeeper.ZooKeeper;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.zookeeper.data.ACL;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.zookeeper.data.Stat;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.AfterClass;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.BeforeClass;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Test;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.junit.experimental.categories.Category;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a 
name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>@Category({ ZKTests.class, 
MediumTests.class })<a name="line.51"></a>
-<span class="sourceLineNo">052</span>public class TestZKUtil {<a 
name="line.52"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a 
name="line.52"></a>
 <span class="sourceLineNo">053</span><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(TestZKUtil.class);<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKUtil.class);<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static HBaseZKTestingUtility 
UTIL = new HBaseZKTestingUtility();<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static ZKWatcher ZKW;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @BeforeClass<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static void setUp() throws 
Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    
UTIL.startMiniZKCluster().getClientPort();<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    ZKW = new ZKWatcher(new 
Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>        new WarnOnlyAbortable());<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>  @AfterClass<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static void tearDown() throws 
IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    Closeables.close(ZKW, true);<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    UTIL.shutdownMiniZKCluster();<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    UTIL.cleanupTestDir();<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<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>   * Create a znode with data<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  @Test<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  public void testCreateWithParents() 
throws KeeperException, InterruptedException {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    byte[] expectedData = new byte[] { 1, 
2, 3 };<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    byte[] data = ZKUtil.getData(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents");<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1");<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    ZKUtil.createWithParents(ZKW, 
"/testCreateWithParents", expectedData);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    data = ZKUtil.getData(ZKW, 
"/testCreateWithParents");<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/testCreateWithParents");<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>  /**<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * Create a bunch of znodes in a 
hierarchy, try deleting one that has childs (it will fail), then<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>   * delete it recursively, then delete 
the last znode<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   */<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void testZNodeDeletes() throws 
Exception {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4");<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    try {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>      fail("We should not be able to 
delete if znode has childs");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    } catch (KeeperException ex) {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      
assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    // make sure it really is deleted<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2/l3/l4", null));<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>    // do the same delete again and make 
sure it doesn't crash<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.114"></a>
+<span class="sourceLineNo">054</span>@Category({ ZKTests.class, 
MediumTests.class })<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class TestZKUtil {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @ClassRule<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      
HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKUtil.class);<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  private static HBaseZKTestingUtility 
UTIL = new HBaseZKTestingUtility();<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private static ZKWatcher ZKW;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  @BeforeClass<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public static void setUp() throws 
Exception {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    
UTIL.startMiniZKCluster().getClientPort();<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    ZKW = new ZKWatcher(new 
Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>        new WarnOnlyAbortable());<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  @AfterClass<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public static void tearDown() throws 
IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    Closeables.close(ZKW, true);<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    UTIL.shutdownMiniZKCluster();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    UTIL.cleanupTestDir();<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * Create a znode with data<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  @Test<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public void testCreateWithParents() 
throws KeeperException, InterruptedException {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    byte[] expectedData = new byte[] { 1, 
2, 3 };<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    byte[] data = ZKUtil.getData(ZKW, 
"/l1/l2/l3/l4/testCreateWithParents");<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1");<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>    ZKUtil.createWithParents(ZKW, 
"/testCreateWithParents", expectedData);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    data = ZKUtil.getData(ZKW, 
"/testCreateWithParents");<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    assertTrue(Bytes.equals(expectedData, 
data));<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/testCreateWithParents");<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Create a bunch of znodes in a 
hierarchy, try deleting one that has childs (it will fail), then<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>   * delete it recursively, then delete 
the last znode<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  @Test<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  public void testZNodeDeletes() throws 
Exception {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    ZKUtil.createWithParents(ZKW, 
"/l1/l2/l3/l4");<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    try {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      fail("We should not be able to 
delete if znode has childs");<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    } catch (KeeperException ex) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      
assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    // make sure it really is deleted<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2/l3/l4", null));<a name="line.114"></a>
 <span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>    ZKUtil.deleteNode(ZKW, "/l1");<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2", null));<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>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * A test for HBASE-3238<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @throws IOException A connection 
attempt to zk failed<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   * @throws InterruptedException One of 
the non ZKUtil actions was interrupted<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   * @throws KeeperException Any of the 
zookeeper connections had a KeeperException<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void 
testCreateSilentIsReallySilent()<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      throws InterruptedException, 
KeeperException, IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    Configuration c = 
UTIL.getConfiguration();<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    String aclZnode = "/aclRoot";<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    String quorumServers = 
ZKConfig.getZKQuorumServersString(c);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    int sessionTimeout = 5 * 1000; // 5 
seconds<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    ZooKeeper zk = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    zk.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    // Save the previous ACL<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>    Stat s = null;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    List&lt;ACL&gt; oldACL = null;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    while (true) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      try {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        s = new Stat();<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>        oldACL = zk.getACL("/", s);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>        break;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      } catch (KeeperException e) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>        switch (e.code()) {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>          case CONNECTIONLOSS:<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>          case SESSIONEXPIRED:<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>          case OPERATIONTIMEOUT:<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>            LOG.warn("Possibly transient 
ZooKeeper exception", e);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            Threads.sleep(100);<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>            break;<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          default:<a name="line.153"></a>
-<span class="sourceLineNo">154</span>            throw e;<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>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    // I set this acl after the attempted 
creation of the cluster home node.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    // Add retries in case of retryable 
zk exceptions.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    while (true) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      try {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        zk.setACL("/", 
ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        break;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      } catch (KeeperException e) {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>        switch (e.code()) {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>          case CONNECTIONLOSS:<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>          case SESSIONEXPIRED:<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>          case OPERATIONTIMEOUT:<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>            Threads.sleep(100);<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>            break;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>          default:<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            throw e;<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>    while (true) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      try {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        zk.create(aclZnode, null, 
ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        break;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      } catch (KeeperException e) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>        switch (e.code()) {<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>          case CONNECTIONLOSS:<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>          case SESSIONEXPIRED:<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>          case OPERATIONTIMEOUT:<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            Threads.sleep(100);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>            break;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>          default:<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            throw e;<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>        }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    zk.close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    ZKUtil.createAndFailSilent(ZKW, 
aclZnode);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // Restore the ACL<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    ZooKeeper zk3 = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    zk3.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    try {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      zk3.setACL("/", oldACL, -1);<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    } finally {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      zk3.close();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * Test should not fail with NPE when 
getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   */<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Test<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  @SuppressWarnings("deprecation")<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>  public void 
testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    
ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<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>  private static class WarnOnlyAbortable 
implements Abortable {<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>    @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    public void abort(String why, 
Throwable e) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      LOG.warn("ZKWatcher received abort, 
ignoring.  Reason: " + why);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      if (LOG.isDebugEnabled()) {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>        LOG.debug(e.toString(), e);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>    @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    public boolean isAborted() {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>      return false;<a name="line.230"></a>
+<span class="sourceLineNo">116</span>    // do the same delete again and make 
sure it doesn't crash<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ZKUtil.deleteNodeRecursively(ZKW, 
"/l1/l2");<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    ZKUtil.deleteNode(ZKW, "/l1");<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, 
"/l1/l2", null));<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  private int getZNodeDataVersion(String 
znode) throws KeeperException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Stat stat = new Stat();<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    ZKUtil.getDataNoWatch(ZKW, znode, 
stat);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return stat.getVersion();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>  @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  public void testSetDataWithVersion() 
throws Exception {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    ZKUtil.createWithParents(ZKW, 
"/s1/s2/s3");<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    int v0 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    assertEquals(0, v0);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", 
Bytes.toBytes(12L));<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    int v1 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    assertEquals(1, v1);<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>    ZKUtil.multiOrSequential(ZKW,<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      
ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), 
false);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    int v2 = 
getZNodeDataVersion("/s1/s2/s3");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    assertEquals(2, v2);<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * A test for HBASE-3238<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>   * @throws IOException A connection 
attempt to zk failed<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * @throws InterruptedException One of 
the non ZKUtil actions was interrupted<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @throws KeeperException Any of the 
zookeeper connections had a KeeperException<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Test<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void 
testCreateSilentIsReallySilent()<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      throws InterruptedException, 
KeeperException, IOException {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    Configuration c = 
UTIL.getConfiguration();<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>    String aclZnode = "/aclRoot";<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    String quorumServers = 
ZKConfig.getZKQuorumServersString(c);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    int sessionTimeout = 5 * 1000; // 5 
seconds<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    ZooKeeper zk = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    zk.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // Save the previous ACL<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>    Stat s = null;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    List&lt;ACL&gt; oldACL = null;<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>    while (true) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      try {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        s = new Stat();<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>        oldACL = zk.getACL("/", s);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>        break;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      } catch (KeeperException e) {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>        switch (e.code()) {<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>          case CONNECTIONLOSS:<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>          case SESSIONEXPIRED:<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>          case OPERATIONTIMEOUT:<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>            LOG.warn("Possibly transient 
ZooKeeper exception", e);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            Threads.sleep(100);<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>            break;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          default:<a name="line.178"></a>
+<span class="sourceLineNo">179</span>            throw e;<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>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // I set this acl after the attempted 
creation of the cluster home node.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    // Add retries in case of retryable 
zk exceptions.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    while (true) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      try {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        zk.setACL("/", 
ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        break;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      } catch (KeeperException e) {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>        switch (e.code()) {<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>          case CONNECTIONLOSS:<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>          case SESSIONEXPIRED:<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>          case OPERATIONTIMEOUT:<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            Threads.sleep(100);<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>            break;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          default:<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            throw e;<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><a name="line.203"></a>
+<span class="sourceLineNo">204</span>    while (true) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      try {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        zk.create(aclZnode, null, 
ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        break;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      } catch (KeeperException e) {<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>        switch (e.code()) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>          case CONNECTIONLOSS:<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>          case SESSIONEXPIRED:<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>          case OPERATIONTIMEOUT:<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>            LOG.warn("Possibly transient 
ZooKeeper exception: " + e);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            Threads.sleep(100);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>            break;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          default:<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            throw e;<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>        }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    zk.close();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    ZKUtil.createAndFailSilent(ZKW, 
aclZnode);<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    // Restore the ACL<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    ZooKeeper zk3 = new 
ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    zk3.addAuthInfo("digest", 
"hbase:rox".getBytes());<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      zk3.setACL("/", oldACL, -1);<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>    } finally {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      zk3.close();<a name="line.230"></a>
 <span class="sourceLineNo">231</span>    }<a name="line.231"></a>
 <span class="sourceLineNo">232</span>  }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>}<a name="line.233"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>  /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * Test should not fail with NPE when 
getChildDataAndWatchForNewChildren invoked with wrongNode<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>  @SuppressWarnings("deprecation")<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>  public void 
testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    
ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>  }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>  private static class WarnOnlyAbortable 
implements Abortable {<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    @Override<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    public void abort(String why, 
Throwable e) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      LOG.warn("ZKWatcher received abort, 
ignoring.  Reason: " + why);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      if (LOG.isDebugEnabled()) {<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        LOG.debug(e.toString(), e);<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    @Override<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    public boolean isAborted() {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      return false;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>}<a name="line.258"></a>