[hbase] branch branch-2.2 updated: HBASE-24656 [Flakey Tests] branch-2 TestMasterNoCluster.testStopDuringStart (#1998)

[zghao]

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

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


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 23f295d  HBASE-24656 [Flakey Tests] branch-2 
TestMasterNoCluster.testStopDuringStart (#1998)
23f295d is described below

commit 23f295d9f271f8d991936b01d41dc97c70fa82eb
Author: Michael Stack <saintst...@users.noreply.github.com>
AuthorDate: Mon Jun 29 11:10:14 2020 -0700

    HBASE-24656 [Flakey Tests] branch-2 TestMasterNoCluster.testStopDuringStart 
(#1998)
---
 .../hadoop/hbase/master/TestMasterNoCluster.java       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
index 15b14b4..7322836 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.ServerLoad;
 import org.apache.hadoop.hbase.ServerMetricsBuilder;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.Waiter;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
 import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.client.HConnectionTestingUtility;
@@ -117,7 +118,22 @@ public class TestMasterNoCluster {
         return false;
       }
     });
-    ZKUtil.deleteNodeRecursively(zkw, zkw.getZNodePaths().baseZNode);
+    // Before fails sometimes so retry.
+    try {
+      TESTUTIL.waitFor(10000, new Waiter.Predicate<Exception>() {
+        @Override public boolean evaluate() throws Exception {
+          try {
+            ZKUtil.deleteNodeRecursively(zkw, zkw.getZNodePaths().baseZNode);
+            return true;
+          } catch (KeeperException.NotEmptyException e) {
+            LOG.info("Failed delete, retrying", e);
+          }
+          return false;
+        }
+      });
+    } catch (Exception e) {
+      LOG.info("Failed zk clear", e);
+    }
     zkw.close();
   }