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

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


The following commit(s) were added to refs/heads/master by this push:
     new 318aa2bf915 Remove ensembleTracker configuration (#22747)
318aa2bf915 is described below

commit 318aa2bf9155609351386da3c8a409973049eb33
Author: zhaojinchao <[email protected]>
AuthorDate: Fri Dec 9 00:11:27 2022 +0800

    Remove ensembleTracker configuration (#22747)
---
 .../mode/repository/cluster/zookeeper/ZookeeperRepository.java       | 3 +--
 .../repository/cluster/zookeeper/props/ZookeeperPropertyKey.java     | 5 -----
 proxy/bootstrap/src/main/resources/conf/server.yaml                  | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
 
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
index ebd4d54a74b..298e97cc372 100644
--- 
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
+++ 
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
@@ -82,9 +82,8 @@ public final class ZookeeperRepository implements 
ClusterPersistRepository, Inst
         int maxRetries = 
zookeeperProps.getValue(ZookeeperPropertyKey.MAX_RETRIES);
         int timeToLiveSeconds = 
zookeeperProps.getValue(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS);
         int operationTimeoutMilliseconds = 
zookeeperProps.getValue(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS);
-        boolean ensembleTracker = 
zookeeperProps.getValue(ZookeeperPropertyKey.ENSEMBLE_TRACKER);
         builder.connectString(config.getServerLists())
-                .ensembleTracker(ensembleTracker)
+                .ensembleTracker(false)
                 .retryPolicy(new 
ExponentialBackoffRetry(retryIntervalMilliseconds, maxRetries, 
retryIntervalMilliseconds * maxRetries))
                 .namespace(config.getNamespace());
         if (0 != timeToLiveSeconds) {
diff --git 
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
 
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
index 010dbf10516..43631b17165 100644
--- 
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
+++ 
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
@@ -48,11 +48,6 @@ public enum ZookeeperPropertyKey implements TypedPropertyKey 
{
      */
     OPERATION_TIMEOUT_MILLISECONDS("operationTimeoutMilliseconds", 
String.valueOf(500), int.class),
     
-    /**
-     * ZooKeeper client ensemble tracker.
-     */
-    ENSEMBLE_TRACKER("ensembleTracker", String.valueOf(Boolean.TRUE), 
boolean.class),
-    
     /**
      * ZooKeeper client connection authorization schema name.
      */
diff --git a/proxy/bootstrap/src/main/resources/conf/server.yaml 
b/proxy/bootstrap/src/main/resources/conf/server.yaml
index bdef75565e7..166959eaa3c 100644
--- a/proxy/bootstrap/src/main/resources/conf/server.yaml
+++ b/proxy/bootstrap/src/main/resources/conf/server.yaml
@@ -32,7 +32,6 @@
 #      timeToLiveSeconds: 60
 #      maxRetries: 3
 #      operationTimeoutMilliseconds: 500
-#      ensembleTracker: true
 #
 #authority:
 #  users:

Reply via email to