remove zookeeper part 2

Alluxio · Aug 21, 2023 · 0327e35 · 0327e35
1 parent 58e5b26
commit 0327e35
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 767 deletions.
diff --git a/dora/core/client/hdfs/src/test/java/alluxio/hadoop/HadoopUtilsTest.java b/dora/core/client/hdfs/src/test/java/alluxio/hadoop/HadoopUtilsTest.java
@@ -72,12 +72,4 @@ public void testGetPathWithoutSchemaFromHDFSURI() {
     final String output = HadoopUtils.getPathWithoutScheme(path);
     assertEquals("/foo/bar/baz", output);
   }
-
-  @Test
-  public void testGetPathWithoutSchemeFromZookeeperURI() {
-    Path path
-        = new Path(URI.create("alluxio://zk@host1:port1,host2:port2,host3:port3/foo/bar/baz"));
-    String output = HadoopUtils.getPathWithoutScheme(path);
-    assertEquals("/foo/bar/baz", output);
-  }
 }
diff --git a/dora/core/common/src/main/java/alluxio/check/UpdateCheck.java b/dora/core/common/src/main/java/alluxio/check/UpdateCheck.java
@@ -63,7 +63,6 @@ public final class UpdateCheck {
   static final String INODE_METASTORE_ROCKS_KEY = "inodeRocks";
   static final String BLOCK_METASTORE_ROCKS_KEY = "blockRocks";
   static final String UNSAFE_PERSIST_KEY = "unsafePersist";
-  static final String ZOOKEEPER_KEY = "zookeeper";
 
   /**
    * @param id the id of the current Alluxio identity (e.g. cluster id, instance id)

diff --git a/dora/core/common/src/main/java/alluxio/master/MasterInquireClient.java b/dora/core/common/src/main/java/alluxio/master/MasterInquireClient.java
@@ -12,10 +12,8 @@
 package alluxio.master;
 
 import alluxio.conf.AlluxioConfiguration;
-import alluxio.conf.PropertyKey;
 import alluxio.exception.status.UnavailableException;
 import alluxio.master.SingleMasterInquireClient.SingleMasterConnectDetails;
-import alluxio.master.ZkMasterInquireClient.ZkMasterConnectDetails;
 import alluxio.security.user.UserState;
 import alluxio.uri.Authority;
 import alluxio.util.ConfigurationUtils;

diff --git a/dora/core/common/src/main/java/alluxio/master/ZkMasterInquireClient.java b/dora/core/common/src/main/java/alluxio/master/ZkMasterInquireClient.java
diff --git a/dora/core/common/src/main/java/alluxio/master/ZookeeperConnectionErrorPolicy.java b/dora/core/common/src/main/java/alluxio/master/ZookeeperConnectionErrorPolicy.java
diff --git a/dora/core/common/src/main/java/alluxio/uri/Authority.java b/dora/core/common/src/main/java/alluxio/uri/Authority.java
@@ -24,10 +24,7 @@
 public interface Authority extends Comparable<Authority>, Serializable {
   Logger LOG = LoggerFactory.getLogger(Authority.class);
   Pattern LOGICAL_MASTER_AUTH = Pattern.compile("^ebj@([a-zA-Z_\\-0-9.]+)$");
-  Pattern LOGICAL_ZOOKEEPER_AUTH = Pattern.compile("^zk@([a-zA-Z_\\-0-9.]+)$");
   Pattern SINGLE_MASTER_AUTH = Pattern.compile("^([^:,;]+):(\\d+)$");
-  // We allow zookeeper/multi_master authorities to be delimited by ',' ';' or '+'.
-  Pattern ZOOKEEPER_AUTH = Pattern.compile("^zk@([^:,;+]+:\\d+([,;+][^:,;+]+:\\d+)*)$");
   Pattern MULTI_MASTERS_AUTH = Pattern.compile("^[^:,;+]+:\\d+([,;+][^:,;+]+:\\d+)+$");
 
   /**

diff --git a/dora/core/common/src/test/java/alluxio/master/MasterInquireClientTest.java b/dora/core/common/src/test/java/alluxio/master/MasterInquireClientTest.java
@@ -19,8 +19,6 @@
 import alluxio.conf.PropertyKey;
 import alluxio.master.MasterInquireClient.ConnectDetails;
 import alluxio.master.SingleMasterInquireClient.SingleMasterConnectDetails;
-import alluxio.master.ZkMasterInquireClient.ZkMasterConnectDetails;
-import alluxio.master.journal.JournalType;
 import alluxio.util.network.NetworkAddressUtils;
 import alluxio.util.network.NetworkAddressUtils.ServiceType;