[hbase] branch master updated: HBASE-24277 TestZooKeeper is flaky (#1617)

[zh...@apache.org]

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

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new e8504ba  HBASE-24277 TestZooKeeper is flaky (#1617)
e8504ba is described below

commit e8504ba817b4f0a4afc5029ed565f23c7ac6c3b7
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri May 1 20:34:42 2020 +0800

    HBASE-24277 TestZooKeeper is flaky (#1617)
---
 hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index b1bff51..4bbb3ed 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -76,9 +76,11 @@ public class TestZooKeeper {
     Configuration conf = TEST_UTIL.getConfiguration();
     TEST_UTIL.startMiniDFSCluster(2);
     TEST_UTIL.startMiniZKCluster();
+    conf.set(HConstants.CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
+      HConstants.ZK_CONNECTION_REGISTRY_CLASS);
     conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 1000);
     conf.setClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, MockLoadBalancer.class,
-        LoadBalancer.class);
+      LoadBalancer.class);
     TEST_UTIL.startMiniDFSCluster(2);
   }