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 2024/03/21 14:44:24 UTC

(hbase-site) branch asf-site updated: Published site at ade6ab2148d93f5003df9f44c1c7bb38d489e081.

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/hbase-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new b97b8857540 Published site at ade6ab2148d93f5003df9f44c1c7bb38d489e081.
b97b8857540 is described below

commit b97b88575409f37022ae97d95899d9c4b965f5ed
Author: jenkins <bu...@apache.org>
AuthorDate: Thu Mar 21 14:43:54 2024 +0000

    Published site at ade6ab2148d93f5003df9f44c1c7bb38d489e081.
---
 acid-semantics.html                                |   2 +-
 apache_hbase_reference_guide.pdf                   |   4 +-
 book.html                                          |   2 +-
 bulk-loads.html                                    |   2 +-
 checkstyle-aggregate.html                          |  18 +-
 coc.html                                           |   2 +-
 dependencies.html                                  |   2 +-
 dependency-convergence.html                        |   2 +-
 dependency-info.html                               |   2 +-
 dependency-management.html                         |   4 +-
 .../hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html |   8 +-
 .../ZKUtil.ZKUtilOp.CreateAndFailSilent.html       |   8 +-
 .../ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html      |   8 +-
 .../hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html   |   8 +-
 .../hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html    |   8 +-
 .../org/apache/hadoop/hbase/zookeeper/ZKUtil.html  |   8 +-
 downloads.html                                     |   2 +-
 export_control.html                                |   2 +-
 index.html                                         |   2 +-
 issue-management.html                              |   2 +-
 licenses.html                                      |   2 +-
 mailing-lists.html                                 |   2 +-
 metrics.html                                       |   2 +-
 old_news.html                                      |   2 +-
 plugin-management.html                             |   2 +-
 plugins.html                                       |   2 +-
 poweredbyhbase.html                                |   2 +-
 project-info.html                                  |   2 +-
 project-reports.html                               |   2 +-
 pseudo-distributed.html                            |   2 +-
 replication.html                                   |   2 +-
 resources.html                                     |   2 +-
 scm.html                                           |   2 +-
 sponsors.html                                      |   2 +-
 summary.html                                       |   2 +-
 supportingprojects.html                            |   2 +-
 team.html                                          |   2 +-
 testdevapidocs/index-all.html                      |   2 +
 .../org/apache/hadoop/hbase/package-tree.html      |  16 +-
 .../hadoop/hbase/procedure2/package-tree.html      |   2 +-
 .../hadoop/hbase/regionserver/package-tree.html    |   4 +-
 .../org/apache/hadoop/hbase/test/package-tree.html |   4 +-
 .../zookeeper/TestZKUtil.WarnOnlyAbortable.html    |   8 +-
 .../apache/hadoop/hbase/zookeeper/TestZKUtil.html  |  70 ++--
 .../zookeeper/TestZKUtil.WarnOnlyAbortable.html    | 451 ++++++++++-----------
 .../apache/hadoop/hbase/zookeeper/TestZKUtil.html  | 451 ++++++++++-----------
 46 files changed, 570 insertions(+), 568 deletions(-)

diff --git a/acid-semantics.html b/acid-semantics.html
index b3a23a376ea..86c2dd723c5 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -464,7 +464,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index d1c1205a655..5d29b7f4bfb 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
 /Author (Apache HBase Team)
 /Creator (Asciidoctor PDF 2.0.6, based on Prawn 2.4.0)
 /Producer (Apache HBase Team)
-/ModDate (D:20240319142956+00'00')
-/CreationDate (D:20240319144135+00'00')
+/ModDate (D:20240321142956+00'00')
+/CreationDate (D:20240321144134+00'00')
 >>
 endobj
 2 0 obj
diff --git a/book.html b/book.html
index f6224e417a4..445590b25a8 100644
--- a/book.html
+++ b/book.html
@@ -49170,7 +49170,7 @@ org/apache/hadoop/hbase/security/access/AccessControlClient.revoke:(Lorg/apache/
 <div id="footer">
 <div id="footer-text">
 Version 4.0.0-alpha-1-SNAPSHOT<br>
-Last updated 2024-03-19 14:29:56 UTC
+Last updated 2024-03-21 14:29:56 UTC
 </div>
 </div>
 <script type="text/x-mathjax-config">
diff --git a/bulk-loads.html b/bulk-loads.html
index 17ff3e1764a..60123219b66 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -180,7 +180,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 5d6c4d66209..dd88c6345fa 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -3244,7 +3244,7 @@
 <tr class="a">
 <td>annotation</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_annotation.html#MissingDeprecated">MissingDeprecated</a></td>
-<td>13</td>
+<td>10</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
 <tr class="b">
 <td>blocks</td>
@@ -3319,7 +3319,7 @@
 <tr class="b">
 <td>javadoc</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>46</td>
+<td>49</td>
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td></tr>
 <tr class="a">
 <td>misc</td>
@@ -4710,8 +4710,8 @@
 <th>Line</th></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 20 has parse error. Missed HTML close tag 'path-to-conf'. Sometimes it means that close tag missed for one of previous tags.</td>
 <td>172</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.client.Action.java">org/apache/hadoop/hbase/client/Action.java</h3>
@@ -9956,8 +9956,8 @@
 <th>Line</th></tr>
 <tr class="b">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 14 has parse error. Details: mismatched input ':' expecting &lt;EOF&gt; while parsing JAVADOC</td>
 <td>46</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.mapreduce.SimpleTotalOrderPartitioner.java">org/apache/hadoop/hbase/mapreduce/SimpleTotalOrderPartitioner.java</h3>
@@ -16482,8 +16482,8 @@
 <th>Line</th></tr>
 <tr class="a">
 <td><figure><img src="images/icon_error_sml.gif" alt="" /></figure>&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 20 has parse error. Missed HTML close tag 'SpanData'. Sometimes it means that close tag missed for one of previous tags.</td>
 <td>65</td></tr></table></section><section>
 <h3 id="org.apache.hadoop.hbase.util.AbstractHBaseTool.java">org/apache/hadoop/hbase/util/AbstractHBaseTool.java</h3>
@@ -18714,7 +18714,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/coc.html b/coc.html
index e10a673f56b..63ec35f396e 100644
--- a/coc.html
+++ b/coc.html
@@ -248,7 +248,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependencies.html b/dependencies.html
index 431600091f4..347ba78be46 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -313,7 +313,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 127747b8427..bf9cb3453bb 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -1010,7 +1010,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-info.html b/dependency-info.html
index b3e34ffe304..8cb20e33f83 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -195,7 +195,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-management.html b/dependency-management.html
index 6545e8d5728..5ef0f66f8ff 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -1451,7 +1451,7 @@
 <tr class="b">
 <td align="left">org.apache.zookeeper</td>
 <td><a class="externalLink" href="http://zookeeper.apache.org/zookeeper">zookeeper</a></td>
-<td>3.8.3</td>
+<td>3.8.4</td>
 <td>-</td>
 <td>jar</td>
 <td><a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
@@ -1758,7 +1758,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html
index 4940992bebc..712b7e96607 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html
@@ -780,8 +780,8 @@
 <span class="sourceLineNo">772</span>    throws KeeperException {<a name="line.772"></a>
 <span class="sourceLineNo">773</span>    CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();<a name="line.773"></a>
 <span class="sourceLineNo">774</span>    String znode = create.getPath();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.776"></a>
+<span class="sourceLineNo">775</span>    RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    try {<a name="line.776"></a>
 <span class="sourceLineNo">777</span>      if (zk.exists(znode, false) == null) {<a name="line.777"></a>
 <span class="sourceLineNo">778</span>        zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));<a name="line.778"></a>
 <span class="sourceLineNo">779</span>      }<a name="line.779"></a>
@@ -789,9 +789,9 @@
 <span class="sourceLineNo">781</span>      // pass<a name="line.781"></a>
 <span class="sourceLineNo">782</span>    } catch (KeeperException.NoAuthException nee) {<a name="line.782"></a>
 <span class="sourceLineNo">783</span>      try {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>        if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {<a name="line.784"></a>
+<span class="sourceLineNo">784</span>        if (zk.exists(znode, false) == null) {<a name="line.784"></a>
 <span class="sourceLineNo">785</span>          // If we failed to create the file and it does not already exist.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>          throw (nee);<a name="line.786"></a>
+<span class="sourceLineNo">786</span>          throw nee;<a name="line.786"></a>
 <span class="sourceLineNo">787</span>        }<a name="line.787"></a>
 <span class="sourceLineNo">788</span>      } catch (InterruptedException ie) {<a name="line.788"></a>
 <span class="sourceLineNo">789</span>        zkw.interruptedException(ie);<a name="line.789"></a>
diff --git a/downloads.html b/downloads.html
index eb97ee23a98..57c1fe2cc2c 100644
--- a/downloads.html
+++ b/downloads.html
@@ -415,7 +415,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/export_control.html b/export_control.html
index 1c1e441a6ec..2fa7417f916 100644
--- a/export_control.html
+++ b/export_control.html
@@ -205,7 +205,7 @@ for more details.</p>
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/index.html b/index.html
index 2d4726ffde0..225d40df254 100644
--- a/index.html
+++ b/index.html
@@ -278,7 +278,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/issue-management.html b/issue-management.html
index a2dd171719a..22cd01414ca 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -176,7 +176,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/licenses.html b/licenses.html
index 9eb4a2e7960..aa593db9b95 100644
--- a/licenses.html
+++ b/licenses.html
@@ -378,7 +378,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/mailing-lists.html b/mailing-lists.html
index b62827f379c..d4da73aedc6 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -223,7 +223,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/metrics.html b/metrics.html
index fdd06a6563e..4ac7f4c49f4 100644
--- a/metrics.html
+++ b/metrics.html
@@ -327,7 +327,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/old_news.html b/old_news.html
index d9a14276819..67054c87cc5 100644
--- a/old_news.html
+++ b/old_news.html
@@ -324,7 +324,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugin-management.html b/plugin-management.html
index 6d189695c51..1dd94c4c653 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -329,7 +329,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugins.html b/plugins.html
index 8f8ab8be724..2593e8dd2aa 100644
--- a/plugins.html
+++ b/plugins.html
@@ -263,7 +263,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index a576f05c12a..0fcbb6a1858 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -658,7 +658,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-info.html b/project-info.html
index 70a7bade910..6124c3c88e8 100644
--- a/project-info.html
+++ b/project-info.html
@@ -220,7 +220,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-reports.html b/project-reports.html
index b743680ed01..bf8bee20c04 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -193,7 +193,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index 16f7405606e..282e82f1586 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -182,7 +182,7 @@ Running Apache HBase (TM) in pseudo-distributed mode
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/replication.html b/replication.html
index f549b6a8df3..f1668d75650 100644
--- a/replication.html
+++ b/replication.html
@@ -177,7 +177,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/resources.html b/resources.html
index 3611969951d..5f96e491e1e 100644
--- a/resources.html
+++ b/resources.html
@@ -200,7 +200,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/scm.html b/scm.html
index b5961006064..3b4603b735b 100644
--- a/scm.html
+++ b/scm.html
@@ -184,7 +184,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/sponsors.html b/sponsors.html
index c145a98e0ba..0daf5be2237 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -206,7 +206,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/summary.html b/summary.html
index 5f92bf063ee..4be21be91fd 100644
--- a/summary.html
+++ b/summary.html
@@ -217,7 +217,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/supportingprojects.html b/supportingprojects.html
index c480d855c63..2c9fbca9a79 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -396,7 +396,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/team.html b/team.html
index 5e26936f9e3..daed2739613 100644
--- a/team.html
+++ b/team.html
@@ -803,7 +803,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2024
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-19</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2024-03-21</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 8f0f8449f39..ccb54208b33 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -4285,6 +4285,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/util/TestIdReadWriteLockWithObjectPool.IdLockTestThread.html#call--">call()</a></span> - Method in class org.apache.hadoop.hbase.util.<a href="org/apache/hadoop/hbase/util/TestIdReadWriteLockWithObjectPool.IdLockTestThread.html" title="class in org.apache.hadoop.hbase.util">TestIdReadWriteLockWithObjectPool.IdLockTestThread</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#callAndIgnoreTransientError-java.util.concurrent.Callable-">callAndIgnoreTransientError(Callable&lt;V&gt;)</a></span> - Method in class org.apache.hadoop.hbase.zookeeper.<a href="org/apache/hadoop/hbase/zookeeper/TestZKUtil.html" title="class in org.apache.hadoop.hbase.zookeeper">TestZKUtil</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestClientTimeouts.RandomTimeoutBlockingRpcChannel.html#callBlockingMethod-org.apache.hbase.thirdparty.com.google.protobuf.Descriptors.MethodDescriptor-org.apache.hbase.thirdparty.com.google.protobuf.RpcController-org.apache.hbase.thirdparty.com.google.protobuf.Message-org.apache.hbase.thirdparty.com.google.protobuf.Message-">callBlockingMethod(Descriptors.MethodDescriptor, RpcController, Message, Message)</a></span [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/regionreplication/TestRegionReplicationForFlushMarker.ErrorReplayRSRpcServices.html#callCounter">callCounter</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.regionreplication.<a href="org/apache/hadoop/hbase/regionserver/regionreplication/TestRegionReplicationForFlushMarker.ErrorReplayRSRpcServices.html" title="class in org.apache.hadoop.hbase.regionserver.regionreplication">TestRegi [...]
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 3a6321de1f2..e6ee2848fe9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -691,20 +691,20 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">TestCustomPriorityRpcControllerFactory.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.HealthSummary.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.HealthSummary</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">TestCustomPriorityRpcControllerFactory.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ZNodeClusterManager.CmdType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ZNodeClusterManager.CmdType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.HealthSummary.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.HealthSummary</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 68ef70153c6..413f4608201 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -248,10 +248,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 211209c2b89..6399482e6dd 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -784,12 +784,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCompactionState.StateSource.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCompactionState.StateSource</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 325ff6f1b44..80cbd4ae527 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -260,11 +260,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadCommonCrawl.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.VerifyCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.VerifyCounts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.GeneratorCounts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.GeneratorCounts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadCommonCrawl.Counts</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html b/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
index 4c3775f1f38..a3e04bf5686 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.240">TestZKUtil.WarnOnlyAbortable</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.233">TestZKUtil.WarnOnlyAbortable</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements org.apache.hadoop.hbase.Abortable</pre>
 </li>
@@ -201,7 +201,7 @@ implements org.apache.hadoop.hbase.Abortable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WarnOnlyAbortable</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.240">WarnOnlyAbortable</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.233">WarnOnlyAbortable</a>()</pre>
 </li>
 </ul>
 </li>
@@ -218,7 +218,7 @@ implements org.apache.hadoop.hbase.Abortable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>abort</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.243">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;why,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.236">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;why,
                   <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;e)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -232,7 +232,7 @@ implements org.apache.hadoop.hbase.Abortable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isAborted</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.251">isAborted</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.WarnOnlyAbortable.html#line.244">isAborted</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>isAborted</code>&nbsp;in interface&nbsp;<code>org.apache.hadoop.hbase.Abortable</code></dd>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html b/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
index f47e7cefdd5..3867ed1bd7e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = {"i0":10,"i1":10,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.55">TestZKUtil</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.69">TestZKUtil</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -197,40 +197,44 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>private &lt;V&gt;&nbsp;V</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#callAndIgnoreTransientError-java.util.concurrent.Callable-">callAndIgnoreTransientError</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;&nbsp;action)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>private int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#getZNodeDataVersion-java.lang.String-">getZNodeDataVersion</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;znode)</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#setUp--">setUp</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#tearDown--">tearDown</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#testCreateSilentIsReallySilent--">testCreateSilentIsReallySilent</a></span>()</code>
 <div class="block">A test for HBASE-3238</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#testCreateWithParents--">testCreateWithParents</a></span>()</code>
 <div class="block">Create a znode with data</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE--">testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE</a></span>()</code>
 <div class="block">Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#testSetDataWithVersion--">testSetDataWithVersion</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#testZNodeDeletes--">testZNodeDeletes</a></span>()</code>
 <div class="block">Create a bunch of znodes in a hierarchy, try deleting one that has childs (it will fail), then
@@ -265,7 +269,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>CLASS_RULE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.57">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.71">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -274,7 +278,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.59">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.73">LOG</a></pre>
 </li>
 </ul>
 <a name="UTIL">
@@ -283,7 +287,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>UTIL</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseZKTestingUtil.html" title="class in org.apache.hadoop.hbase">HBaseZKTestingUtil</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.61">UTIL</a></pre>
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseZKTestingUtil.html" title="class in org.apache.hadoop.hbase">HBaseZKTestingUtil</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.75">UTIL</a></pre>
 </li>
 </ul>
 <a name="ZKW">
@@ -292,7 +296,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ZKW</h4>
-<pre>private static&nbsp;org.apache.hadoop.hbase.zookeeper.ZKWatcher <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.63">ZKW</a></pre>
+<pre>private static&nbsp;org.apache.hadoop.hbase.zookeeper.ZKWatcher <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.77">ZKW</a></pre>
 </li>
 </ul>
 </li>
@@ -309,7 +313,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestZKUtil</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.55">TestZKUtil</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.69">TestZKUtil</a>()</pre>
 </li>
 </ul>
 </li>
@@ -326,7 +330,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setUp</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.66">setUp</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.80">setUp</a>()
                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -340,7 +344,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDown</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.73">tearDown</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.87">tearDown</a>()
                      throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -354,7 +358,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testCreateWithParents</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.83">testCreateWithParents</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.97">testCreateWithParents</a>()
                            throws org.apache.zookeeper.KeeperException,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <div class="block">Create a znode with data</div>
@@ -371,7 +375,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testZNodeDeletes</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.101">testZNodeDeletes</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.115">testZNodeDeletes</a>()
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Create a bunch of znodes in a hierarchy, try deleting one that has childs (it will fail), then
  delete it recursively, then delete the last znode</div>
@@ -387,7 +391,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getZNodeDataVersion</h4>
-<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.120">getZNodeDataVersion</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;znode)
+<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.134">getZNodeDataVersion</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;znode)
                          throws org.apache.zookeeper.KeeperException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -401,7 +405,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSetDataWithVersion</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.127">testSetDataWithVersion</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.141">testSetDataWithVersion</a>()
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -409,22 +413,32 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
+<a name="callAndIgnoreTransientError-java.util.concurrent.Callable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>callAndIgnoreTransientError</h4>
+<pre>private&nbsp;&lt;V&gt;&nbsp;V&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.156">callAndIgnoreTransientError</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;&nbsp;action)
+                                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="testCreateSilentIsReallySilent--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>testCreateSilentIsReallySilent</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.149">testCreateSilentIsReallySilent</a>()
-                                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a>,
-                                           org.apache.zookeeper.KeeperException,
-                                           <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.179">testCreateSilentIsReallySilent</a>()
+                                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">A test for HBASE-3238</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - A connection attempt to zk failed</dd>
-<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></code> - One of the non ZKUtil actions was interrupted</dd>
-<dd><code>org.apache.zookeeper.KeeperException</code> - Any of the zookeeper connections had a KeeperException</dd>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -434,7 +448,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.236">testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html#line.229">testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE</a>()
                                                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode</div>
 <dl>
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 daeb0e3a805..ef39e4c93d3 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
@@ -30,237 +30,230 @@
 <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.HBaseZKTestingUtil;<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>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>@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>  @ClassRule<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZKUtil.class);<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private static HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static ZKWatcher ZKW;<a name="line.63"></a>
+<span class="sourceLineNo">025</span>import static org.mockito.ArgumentMatchers.any;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.mockito.ArgumentMatchers.anyBoolean;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.mockito.ArgumentMatchers.anyList;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import static org.mockito.ArgumentMatchers.anyString;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import static org.mockito.Mockito.doAnswer;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import static org.mockito.Mockito.mock;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import static org.mockito.Mockito.spy;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import static org.mockito.Mockito.times;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import static org.mockito.Mockito.verify;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import static org.mockito.Mockito.when;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.io.IOException;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.Arrays;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.List;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.concurrent.Callable;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.conf.Configuration;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Abortable;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.HBaseZKTestingUtil;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.Bytes;<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.ZKUtil.ZKUtilOp;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.zookeeper.CreateMode;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.zookeeper.KeeperException;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.zookeeper.ZooDefs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.zookeeper.ZooKeeper;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.zookeeper.data.ACL;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.zookeeper.data.Stat;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.AfterClass;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.BeforeClass;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.ClassRule;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.Test;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.experimental.categories.Category;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.mockito.AdditionalAnswers;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.slf4j.Logger;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.slf4j.LoggerFactory;<a name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @BeforeClass<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void setUp() throws Exception {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    UTIL.startMiniZKCluster().getClientPort();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    ZKW = new ZKWatcher(new Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      new WarnOnlyAbortable());<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">065</span>import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>@Category({ ZKTests.class, MediumTests.class })<a name="line.68"></a>
+<span class="sourceLineNo">069</span>public class TestZKUtil {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @ClassRule<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZKUtil.class);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private static HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  private static ZKWatcher ZKW;<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">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>  private int getZNodeDataVersion(String znode) throws KeeperException {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    Stat stat = new Stat();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    ZKUtil.getDataNoWatch(ZKW, znode, stat);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    return stat.getVersion();<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<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void testSetDataWithVersion() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    ZKUtil.createWithParents(ZKW, "/s1/s2/s3");<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    int v0 = getZNodeDataVersion("/s1/s2/s3");<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    assertEquals(0, v0);<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", Bytes.toBytes(12L));<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    int v1 = getZNodeDataVersion("/s1/s2/s3");<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    assertEquals(1, v1);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>    ZKUtil.multiOrSequential(ZKW,<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), false);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    int v2 = getZNodeDataVersion("/s1/s2/s3");<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertEquals(2, v2);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * A test for HBASE-3238<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @throws IOException          A connection attempt to zk failed<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @throws InterruptedException One of the non ZKUtil actions was interrupted<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @throws KeeperException      Any of the zookeeper connections had a KeeperException<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public void testCreateSilentIsReallySilent()<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    throws InterruptedException, KeeperException, IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    Configuration c = UTIL.getConfiguration();<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    String aclZnode = "/aclRoot";<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    String quorumServers = ZKConfig.getZKQuorumServersString(c);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    int sessionTimeout = 5 * 1000; // 5 seconds<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    // Save the previous ACL<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    Stat s;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    List&lt;ACL&gt; oldACL;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    while (true) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      try {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        s = new Stat();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        oldACL = zk.getACL("/", s);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        break;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      } catch (KeeperException e) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        switch (e.code()) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>          case CONNECTIONLOSS:<a name="line.169"></a>
-<span class="sourceLineNo">170</span>          case SESSIONEXPIRED:<a name="line.170"></a>
-<span class="sourceLineNo">171</span>          case OPERATIONTIMEOUT:<a name="line.171"></a>
-<span class="sourceLineNo">172</span>            LOG.warn("Possibly transient ZooKeeper exception", e);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            Threads.sleep(100);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            break;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          default:<a name="line.175"></a>
-<span class="sourceLineNo">176</span>            throw e;<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>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // I set this acl after the attempted creation of the cluster home node.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    // Add retries in case of retryable zk exceptions.<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    while (true) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      try {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        break;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      } catch (KeeperException e) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        switch (e.code()) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>          case CONNECTIONLOSS:<a name="line.189"></a>
-<span class="sourceLineNo">190</span>          case SESSIONEXPIRED:<a name="line.190"></a>
-<span class="sourceLineNo">191</span>          case OPERATIONTIMEOUT:<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>            Threads.sleep(100);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>            break;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>          default:<a name="line.195"></a>
-<span class="sourceLineNo">196</span>            throw e;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    while (true) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      try {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        zk.create(aclZnode, null, ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        break;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      } catch (KeeperException e) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        switch (e.code()) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>          case CONNECTIONLOSS:<a name="line.207"></a>
-<span class="sourceLineNo">208</span>          case SESSIONEXPIRED:<a name="line.208"></a>
-<span class="sourceLineNo">209</span>          case OPERATIONTIMEOUT:<a name="line.209"></a>
-<span class="sourceLineNo">210</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            Threads.sleep(100);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>            break;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>          default:<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            throw e;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        }<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>    zk.close();<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    ZKUtil.createAndFailSilent(ZKW, aclZnode);<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    // Restore the ACL<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    ZooKeeper zk3 = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    zk3.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    try {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      zk3.setACL("/", oldACL, -1);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    } finally {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      zk3.close();<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 name="line.231"></a>
-<span class="sourceLineNo">232</span>   * Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   */<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  @Test<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  @SuppressWarnings("deprecation")<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>  private static class WarnOnlyAbortable implements Abortable {<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    @Override<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    public void abort(String why, Throwable e) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      LOG.warn("ZKWatcher received abort, ignoring.  Reason: " + why);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      if (LOG.isDebugEnabled()) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        LOG.debug(e.toString(), e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public boolean isAborted() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return false;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>}<a name="line.255"></a>
+<span class="sourceLineNo">079</span>  @BeforeClass<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public static void setUp() throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    UTIL.startMiniZKCluster().getClientPort();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    ZKW = new ZKWatcher(new Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      new WarnOnlyAbortable());<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @AfterClass<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public static void tearDown() throws IOException {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    Closeables.close(ZKW, true);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    UTIL.shutdownMiniZKCluster();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    UTIL.cleanupTestDir();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Create a znode with data<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  @Test<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public void testCreateWithParents() throws KeeperException, InterruptedException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    byte[] expectedData = new byte[] { 1, 2, 3 };<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    ZKUtil.createWithParents(ZKW, "/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    byte[] data = ZKUtil.getData(ZKW, "/l1/l2/l3/l4/testCreateWithParents");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1");<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    ZKUtil.createWithParents(ZKW, "/testCreateWithParents", expectedData);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    data = ZKUtil.getData(ZKW, "/testCreateWithParents");<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    ZKUtil.deleteNodeRecursively(ZKW, "/testCreateWithParents");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * Create a bunch of znodes in a hierarchy, try deleting one that has childs (it will fail), then<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * delete it recursively, then delete the last znode<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  @Test<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public void testZNodeDeletes() throws Exception {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    ZKUtil.createWithParents(ZKW, "/l1/l2/l3/l4");<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    try {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      fail("We should not be able to delete if znode has childs");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    } catch (KeeperException ex) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1/l2");<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    // make sure it really is deleted<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    // do the same delete again and make sure it doesn't crash<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1/l2");<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    ZKUtil.deleteNode(ZKW, "/l1");<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2", null));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  private int getZNodeDataVersion(String znode) throws KeeperException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    Stat stat = new Stat();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    ZKUtil.getDataNoWatch(ZKW, znode, stat);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return stat.getVersion();<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>  @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public void testSetDataWithVersion() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    ZKUtil.createWithParents(ZKW, "/s1/s2/s3");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int v0 = getZNodeDataVersion("/s1/s2/s3");<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    assertEquals(0, v0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", Bytes.toBytes(12L));<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    int v1 = getZNodeDataVersion("/s1/s2/s3");<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    assertEquals(1, v1);<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    ZKUtil.multiOrSequential(ZKW,<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), false);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    int v2 = getZNodeDataVersion("/s1/s2/s3");<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    assertEquals(2, v2);<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>  private &lt;V&gt; V callAndIgnoreTransientError(Callable&lt;V&gt; action) throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    for (;;) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        return action.call();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      } catch (KeeperException e) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        switch (e.code()) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>          case CONNECTIONLOSS:<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          case SESSIONEXPIRED:<a name="line.163"></a>
+<span class="sourceLineNo">164</span>          case OPERATIONTIMEOUT:<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            LOG.warn("Possibly transient ZooKeeper exception", e);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            Threads.sleep(100);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>            break;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>          default:<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            throw e;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>  /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * A test for HBASE-3238<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   */<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  @Test<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  public void testCreateSilentIsReallySilent() throws Exception {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    Configuration c = UTIL.getConfiguration();<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>    String aclZnode = "/aclRoot";<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    String quorumServers = ZKConfig.getZKQuorumServersString(c);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    int sessionTimeout = 5 * 1000; // 5 seconds<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    try (ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>      // Save the previous ACL<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      List&lt;ACL&gt; oldACL = callAndIgnoreTransientError(() -&gt; zk.getACL("/", new Stat()));<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>      // I set this acl after the attempted creation of the cluster home node.<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      // Add retries in case of retryable zk exceptions.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      callAndIgnoreTransientError(() -&gt; zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1));<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>      ZKWatcher watcher = spy(ZKW);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      RecoverableZooKeeper rzk = mock(RecoverableZooKeeper.class,<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        AdditionalAnswers.delegatesTo(ZKW.getRecoverableZooKeeper()));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      when(watcher.getRecoverableZooKeeper()).thenReturn(rzk);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      AtomicBoolean firstExists = new AtomicBoolean(true);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      doAnswer(inv -&gt; {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        String path = inv.getArgument(0);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        boolean watch = inv.getArgument(1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        Stat stat = ZKW.getRecoverableZooKeeper().exists(path, watch);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        // create the znode after first exists check, this is to simulate that we enter the create<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        // branch but we have no permission for creation, but the znode has been created by others<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        if (firstExists.compareAndSet(true, false)) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>          callAndIgnoreTransientError(() -&gt; zk.create(aclZnode, null,<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            Arrays.asList(new ACL(ZooDefs.Perms.READ, ZooDefs.Ids.ANYONE_ID_UNSAFE),<a name="line.208"></a>
+<span class="sourceLineNo">209</span>              new ACL(ZooDefs.Perms.ALL, ZooDefs.Ids.AUTH_IDS)),<a name="line.209"></a>
+<span class="sourceLineNo">210</span>            CreateMode.PERSISTENT));<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        return stat;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      }).when(rzk).exists(any(), anyBoolean());<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      ZKUtil.createAndFailSilent(watcher, aclZnode);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      // make sure we call the exists method twice and create once<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      verify(rzk, times(2)).exists(any(), anyBoolean());<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      verify(rzk).create(anyString(), any(), anyList(), any());<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      // Restore the ACL<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      zk.setACL("/", oldACL, -1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<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>   * Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   */<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  @Test<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  @SuppressWarnings("deprecation")<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>  private static class WarnOnlyAbortable implements Abortable {<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    public void abort(String why, Throwable e) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      LOG.warn("ZKWatcher received abort, ignoring.  Reason: " + why);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      if (LOG.isDebugEnabled()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        LOG.debug(e.toString(), e);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      }<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>    @Override<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    public boolean isAborted() {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      return false;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>}<a name="line.248"></a>
 
 
 
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 daeb0e3a805..ef39e4c93d3 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKUtil.html
@@ -30,237 +30,230 @@
 <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.HBaseZKTestingUtil;<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>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>@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>  @ClassRule<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZKUtil.class);<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private static HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static ZKWatcher ZKW;<a name="line.63"></a>
+<span class="sourceLineNo">025</span>import static org.mockito.ArgumentMatchers.any;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.mockito.ArgumentMatchers.anyBoolean;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.mockito.ArgumentMatchers.anyList;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import static org.mockito.ArgumentMatchers.anyString;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import static org.mockito.Mockito.doAnswer;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import static org.mockito.Mockito.mock;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import static org.mockito.Mockito.spy;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import static org.mockito.Mockito.times;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import static org.mockito.Mockito.verify;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import static org.mockito.Mockito.when;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.io.IOException;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.Arrays;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.List;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.concurrent.Callable;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.conf.Configuration;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Abortable;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.HBaseZKTestingUtil;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.ZKTests;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.Bytes;<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.ZKUtil.ZKUtilOp;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.zookeeper.CreateMode;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.zookeeper.KeeperException;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.zookeeper.ZooDefs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.zookeeper.ZooKeeper;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.zookeeper.data.ACL;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.zookeeper.data.Stat;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.AfterClass;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.BeforeClass;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.ClassRule;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.Test;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.experimental.categories.Category;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.mockito.AdditionalAnswers;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.slf4j.Logger;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.slf4j.LoggerFactory;<a name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @BeforeClass<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static void setUp() throws Exception {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    UTIL.startMiniZKCluster().getClientPort();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    ZKW = new ZKWatcher(new Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      new WarnOnlyAbortable());<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">065</span>import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hbase.thirdparty.com.google.common.io.Closeables;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>@Category({ ZKTests.class, MediumTests.class })<a name="line.68"></a>
+<span class="sourceLineNo">069</span>public class TestZKUtil {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @ClassRule<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestZKUtil.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  private static final Logger LOG = LoggerFactory.getLogger(TestZKUtil.class);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private static HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  private static ZKWatcher ZKW;<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">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>  private int getZNodeDataVersion(String znode) throws KeeperException {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    Stat stat = new Stat();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    ZKUtil.getDataNoWatch(ZKW, znode, stat);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    return stat.getVersion();<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<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public void testSetDataWithVersion() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    ZKUtil.createWithParents(ZKW, "/s1/s2/s3");<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    int v0 = getZNodeDataVersion("/s1/s2/s3");<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    assertEquals(0, v0);<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", Bytes.toBytes(12L));<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    int v1 = getZNodeDataVersion("/s1/s2/s3");<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    assertEquals(1, v1);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>    ZKUtil.multiOrSequential(ZKW,<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), false);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    int v2 = getZNodeDataVersion("/s1/s2/s3");<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertEquals(2, v2);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * A test for HBASE-3238<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @throws IOException          A connection attempt to zk failed<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @throws InterruptedException One of the non ZKUtil actions was interrupted<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @throws KeeperException      Any of the zookeeper connections had a KeeperException<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public void testCreateSilentIsReallySilent()<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    throws InterruptedException, KeeperException, IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    Configuration c = UTIL.getConfiguration();<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    String aclZnode = "/aclRoot";<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    String quorumServers = ZKConfig.getZKQuorumServersString(c);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    int sessionTimeout = 5 * 1000; // 5 seconds<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    // Save the previous ACL<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    Stat s;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    List&lt;ACL&gt; oldACL;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    while (true) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      try {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        s = new Stat();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        oldACL = zk.getACL("/", s);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        break;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      } catch (KeeperException e) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        switch (e.code()) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>          case CONNECTIONLOSS:<a name="line.169"></a>
-<span class="sourceLineNo">170</span>          case SESSIONEXPIRED:<a name="line.170"></a>
-<span class="sourceLineNo">171</span>          case OPERATIONTIMEOUT:<a name="line.171"></a>
-<span class="sourceLineNo">172</span>            LOG.warn("Possibly transient ZooKeeper exception", e);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            Threads.sleep(100);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            break;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          default:<a name="line.175"></a>
-<span class="sourceLineNo">176</span>            throw e;<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>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // I set this acl after the attempted creation of the cluster home node.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    // Add retries in case of retryable zk exceptions.<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    while (true) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      try {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        break;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      } catch (KeeperException e) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        switch (e.code()) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>          case CONNECTIONLOSS:<a name="line.189"></a>
-<span class="sourceLineNo">190</span>          case SESSIONEXPIRED:<a name="line.190"></a>
-<span class="sourceLineNo">191</span>          case OPERATIONTIMEOUT:<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>            Threads.sleep(100);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>            break;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>          default:<a name="line.195"></a>
-<span class="sourceLineNo">196</span>            throw e;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    while (true) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      try {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        zk.create(aclZnode, null, ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        break;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      } catch (KeeperException e) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        switch (e.code()) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>          case CONNECTIONLOSS:<a name="line.207"></a>
-<span class="sourceLineNo">208</span>          case SESSIONEXPIRED:<a name="line.208"></a>
-<span class="sourceLineNo">209</span>          case OPERATIONTIMEOUT:<a name="line.209"></a>
-<span class="sourceLineNo">210</span>            LOG.warn("Possibly transient ZooKeeper exception: " + e);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            Threads.sleep(100);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>            break;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>          default:<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            throw e;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        }<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>    zk.close();<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    ZKUtil.createAndFailSilent(ZKW, aclZnode);<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    // Restore the ACL<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    ZooKeeper zk3 = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    zk3.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    try {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      zk3.setACL("/", oldACL, -1);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    } finally {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      zk3.close();<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 name="line.231"></a>
-<span class="sourceLineNo">232</span>   * Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   */<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  @Test<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  @SuppressWarnings("deprecation")<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>  private static class WarnOnlyAbortable implements Abortable {<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    @Override<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    public void abort(String why, Throwable e) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      LOG.warn("ZKWatcher received abort, ignoring.  Reason: " + why);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      if (LOG.isDebugEnabled()) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        LOG.debug(e.toString(), e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public boolean isAborted() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return false;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>}<a name="line.255"></a>
+<span class="sourceLineNo">079</span>  @BeforeClass<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public static void setUp() throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    UTIL.startMiniZKCluster().getClientPort();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    ZKW = new ZKWatcher(new Configuration(UTIL.getConfiguration()), TestZKUtil.class.getName(),<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      new WarnOnlyAbortable());<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @AfterClass<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public static void tearDown() throws IOException {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    Closeables.close(ZKW, true);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    UTIL.shutdownMiniZKCluster();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    UTIL.cleanupTestDir();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Create a znode with data<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  @Test<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public void testCreateWithParents() throws KeeperException, InterruptedException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    byte[] expectedData = new byte[] { 1, 2, 3 };<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    ZKUtil.createWithParents(ZKW, "/l1/l2/l3/l4/testCreateWithParents", expectedData);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    byte[] data = ZKUtil.getData(ZKW, "/l1/l2/l3/l4/testCreateWithParents");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1");<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    ZKUtil.createWithParents(ZKW, "/testCreateWithParents", expectedData);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    data = ZKUtil.getData(ZKW, "/testCreateWithParents");<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    assertTrue(Bytes.equals(expectedData, data));<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    ZKUtil.deleteNodeRecursively(ZKW, "/testCreateWithParents");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * Create a bunch of znodes in a hierarchy, try deleting one that has childs (it will fail), then<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * delete it recursively, then delete the last znode<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  @Test<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public void testZNodeDeletes() throws Exception {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    ZKUtil.createWithParents(ZKW, "/l1/l2/l3/l4");<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    try {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      ZKUtil.deleteNode(ZKW, "/l1/l2");<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      fail("We should not be able to delete if znode has childs");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    } catch (KeeperException ex) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      assertNotNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1/l2");<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    // make sure it really is deleted<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2/l3/l4", null));<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    // do the same delete again and make sure it doesn't crash<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    ZKUtil.deleteNodeRecursively(ZKW, "/l1/l2");<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    ZKUtil.deleteNode(ZKW, "/l1");<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertNull(ZKUtil.getDataNoWatch(ZKW, "/l1/l2", null));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  private int getZNodeDataVersion(String znode) throws KeeperException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    Stat stat = new Stat();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    ZKUtil.getDataNoWatch(ZKW, znode, stat);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return stat.getVersion();<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>  @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public void testSetDataWithVersion() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    ZKUtil.createWithParents(ZKW, "/s1/s2/s3");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int v0 = getZNodeDataVersion("/s1/s2/s3");<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    assertEquals(0, v0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    ZKUtil.setData(ZKW, "/s1/s2/s3", Bytes.toBytes(12L));<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    int v1 = getZNodeDataVersion("/s1/s2/s3");<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    assertEquals(1, v1);<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    ZKUtil.multiOrSequential(ZKW,<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      ImmutableList.of(ZKUtilOp.setData("/s1/s2/s3", Bytes.toBytes(13L), v1)), false);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    int v2 = getZNodeDataVersion("/s1/s2/s3");<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    assertEquals(2, v2);<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>  private &lt;V&gt; V callAndIgnoreTransientError(Callable&lt;V&gt; action) throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    for (;;) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        return action.call();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      } catch (KeeperException e) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        switch (e.code()) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>          case CONNECTIONLOSS:<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          case SESSIONEXPIRED:<a name="line.163"></a>
+<span class="sourceLineNo">164</span>          case OPERATIONTIMEOUT:<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            LOG.warn("Possibly transient ZooKeeper exception", e);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>            Threads.sleep(100);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>            break;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>          default:<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            throw e;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>  /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * A test for HBASE-3238<a name="line.176"></a>
+<span class="sourceLineNo">177</span>   */<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  @Test<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  public void testCreateSilentIsReallySilent() throws Exception {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    Configuration c = UTIL.getConfiguration();<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>    String aclZnode = "/aclRoot";<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    String quorumServers = ZKConfig.getZKQuorumServersString(c);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    int sessionTimeout = 5 * 1000; // 5 seconds<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    try (ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>      // Save the previous ACL<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      List&lt;ACL&gt; oldACL = callAndIgnoreTransientError(() -&gt; zk.getACL("/", new Stat()));<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>      // I set this acl after the attempted creation of the cluster home node.<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      // Add retries in case of retryable zk exceptions.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      callAndIgnoreTransientError(() -&gt; zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1));<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>      ZKWatcher watcher = spy(ZKW);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      RecoverableZooKeeper rzk = mock(RecoverableZooKeeper.class,<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        AdditionalAnswers.delegatesTo(ZKW.getRecoverableZooKeeper()));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      when(watcher.getRecoverableZooKeeper()).thenReturn(rzk);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      AtomicBoolean firstExists = new AtomicBoolean(true);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      doAnswer(inv -&gt; {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        String path = inv.getArgument(0);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        boolean watch = inv.getArgument(1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        Stat stat = ZKW.getRecoverableZooKeeper().exists(path, watch);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        // create the znode after first exists check, this is to simulate that we enter the create<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        // branch but we have no permission for creation, but the znode has been created by others<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        if (firstExists.compareAndSet(true, false)) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>          callAndIgnoreTransientError(() -&gt; zk.create(aclZnode, null,<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            Arrays.asList(new ACL(ZooDefs.Perms.READ, ZooDefs.Ids.ANYONE_ID_UNSAFE),<a name="line.208"></a>
+<span class="sourceLineNo">209</span>              new ACL(ZooDefs.Perms.ALL, ZooDefs.Ids.AUTH_IDS)),<a name="line.209"></a>
+<span class="sourceLineNo">210</span>            CreateMode.PERSISTENT));<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        return stat;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      }).when(rzk).exists(any(), anyBoolean());<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      ZKUtil.createAndFailSilent(watcher, aclZnode);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      // make sure we call the exists method twice and create once<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      verify(rzk, times(2)).exists(any(), anyBoolean());<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      verify(rzk).create(anyString(), any(), anyList(), any());<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      // Restore the ACL<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      zk.setACL("/", oldACL, -1);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<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>   * Test should not fail with NPE when getChildDataAndWatchForNewChildren invoked with wrongNode<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   */<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  @Test<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  @SuppressWarnings("deprecation")<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE() throws Exception {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    ZKUtil.getChildDataAndWatchForNewChildren(ZKW, "/wrongNode");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>  private static class WarnOnlyAbortable implements Abortable {<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    public void abort(String why, Throwable e) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      LOG.warn("ZKWatcher received abort, ignoring.  Reason: " + why);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      if (LOG.isDebugEnabled()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        LOG.debug(e.toString(), e);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      }<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>    @Override<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    public boolean isAborted() {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      return false;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>}<a name="line.248"></a>