[hbase] branch branch-2.2 updated: HBASE-25545 Fix the build problem for branch-2.2 (#2920)

[zg...@apache.org]

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 52c9270  HBASE-25545 Fix the build problem for branch-2.2 (#2920)
52c9270 is described below

commit 52c9270639458bc9dad1466d2d5245c8b8f722d2
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Wed Feb 3 10:37:28 2021 +0800

    HBASE-25545 Fix the build problem for branch-2.2 (#2920)
    
    Signed-off-by: meiyi <my...@gmail.com>
---
 .../apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java
index ee4da74..3881897 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java
@@ -199,10 +199,6 @@ public class TestRetainAssignmentOnRestart extends AbstractTestRestartCluster {
   }
 
   private void setupCluster() throws Exception, IOException, InterruptedException {
-    // Set Zookeeper based connection registry since we will stop master and start a new master
-    // without populating the underlying config for the connection.
-    UTIL.getConfiguration().set(HConstants.CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
-      HConstants.ZK_CONNECTION_REGISTRY_CLASS);
     // Enable retain assignment during ServerCrashProcedure
     UTIL.getConfiguration().setBoolean(ServerCrashProcedure.MASTER_SCP_RETAIN_ASSIGNMENT, true);
     UTIL.startMiniCluster(NUM_OF_RS);
@@ -237,4 +233,4 @@ public class TestRetainAssignmentOnRestart extends AbstractTestRestartCluster {
       assertTrue(found);
     }
   }
-}
\ No newline at end of file
+}