[shardingsphere] branch master updated: Rollback scaling it use more than one proxy. (#20069)

[zhonghongsheng]

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

zhonghongsheng 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 ece08fd5e44 Rollback scaling it use more than one proxy. (#20069)
ece08fd5e44 is described below

commit ece08fd5e445138b94bee3b51de9b6159af86a72
Author: Xinze Guo <101622833+aze...@users.noreply.github.com>
AuthorDate: Thu Aug 11 11:21:41 2022 +0800

    Rollback scaling it use more than one proxy. (#20069)
---
 .../pipeline/framework/container/compose/DockerComposedContainer.java | 4 ----
 .../integration/data/pipeline/framework/watcher/ScalingWatcher.java   | 3 ---
 2 files changed, 7 deletions(-)

diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
index 5cf80fcb3dc..ea575af8952 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
@@ -50,10 +50,6 @@ public final class DockerComposedContainer extends 
BaseComposedContainer {
                 (ShardingSphereProxyClusterContainer) 
AdapterContainerFactory.newInstance("Cluster", "proxy", databaseType, 
storageContainer, "", "scaling");
         proxyClusterContainer.dependsOn(governanceContainer, storageContainer);
         proxyContainer = 
getContainers().registerContainer(proxyClusterContainer);
-        ShardingSphereProxyClusterContainer anotherProxyContainer =
-                (ShardingSphereProxyClusterContainer) 
AdapterContainerFactory.newInstance("Cluster", "proxy", databaseType, 
storageContainer, "", "scaling");
-        anotherProxyContainer.dependsOn(governanceContainer, storageContainer);
-        getContainers().registerContainer(anotherProxyContainer);
     }
     
     @Override
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
index 5d2c200c9e7..59e7f49af11 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
@@ -76,9 +76,6 @@ public class ScalingWatcher extends TestWatcher {
     
     private void addZookeeperData(final String key, final String parentPath, 
final ClusterPersistRepository zookeeperRepository, final Map<String, String> 
nodeMap) {
         String path = String.join("/", parentPath, key);
-        if (path.endsWith("/config")) {
-            return;
-        }
         String data = zookeeperRepository.get(path);
         nodeMap.put(path, data);
         List<String> childrenKeys = zookeeperRepository.getChildrenKeys(path);