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

menghaoran 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 4f87230  Add root path for scaling repository (#8970)
4f87230 is described below

commit 4f872308073fd9824f8f68f3602e084cf5cf2d73
Author: 邱鹿 Lucas <[email protected]>
AuthorDate: Mon Jan 11 10:43:30 2021 +0800

    Add root path for scaling repository (#8970)
    
    Co-authored-by: qiulu3 <Lucas209910>
---
 .../scaling/core/constant/ScalingConstant.java               | 12 +++++++++++-
 .../scaling/elasticjob/util/ElasticJobUtils.java             |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/constant/ScalingConstant.java
 
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/constant/ScalingConstant.java
index 3d069cc..c677fd4 100644
--- 
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/constant/ScalingConstant.java
+++ 
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/constant/ScalingConstant.java
@@ -42,9 +42,19 @@ public final class ScalingConstant {
     public static final String DELETE = "DELETE";
     
     /**
+     * Scaling root path.
+     */
+    public static final String SCALING_ROOT_PATH = "/scaling";
+    
+    /**
      * Scaling listener path.
      */
-    public static final String SCALING_LISTENER_PATH = "/__scaling_listener";
+    public static final String SCALING_LISTENER_PATH = SCALING_ROOT_PATH + 
"/listener";
+    
+    /**
+     * Scaling elastic job path.
+     */
+    public static final String SCALING_ELASTIC_JOB_PATH = SCALING_ROOT_PATH + 
"/elastic_job";
     
     /**
      * Config.
diff --git 
a/shardingsphere-scaling/shardingsphere-scaling-elasticjob/src/main/java/org/apache/shardingsphere/scaling/elasticjob/util/ElasticJobUtils.java
 
b/shardingsphere-scaling/shardingsphere-scaling-elasticjob/src/main/java/org/apache/shardingsphere/scaling/elasticjob/util/ElasticJobUtils.java
index f2cc08b..356d0af 100644
--- 
a/shardingsphere-scaling/shardingsphere-scaling-elasticjob/src/main/java/org/apache/shardingsphere/scaling/elasticjob/util/ElasticJobUtils.java
+++ 
b/shardingsphere-scaling/shardingsphere-scaling-elasticjob/src/main/java/org/apache/shardingsphere/scaling/elasticjob/util/ElasticJobUtils.java
@@ -24,6 +24,7 @@ import 
org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
 import 
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
 import 
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
 import 
org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
+import org.apache.shardingsphere.scaling.core.constant.ScalingConstant;
 
 import java.util.Properties;
 
@@ -46,7 +47,8 @@ public final class ElasticJobUtils {
     }
     
     private static ZookeeperConfiguration getZookeeperConfig(final 
GovernanceConfiguration governanceConfig) {
-        ZookeeperConfiguration result = new 
ZookeeperConfiguration(governanceConfig.getRegistryCenterConfiguration().getServerLists(),
 governanceConfig.getName());
+        ZookeeperConfiguration result = new 
ZookeeperConfiguration(governanceConfig.getRegistryCenterConfiguration().getServerLists(),
+                governanceConfig.getName() + 
ScalingConstant.SCALING_ELASTIC_JOB_PATH);
         Properties props = 
governanceConfig.getRegistryCenterConfiguration().getProps();
         result.setMaxSleepTimeMilliseconds(getProperty(props, 
"max.sleep.time.milliseconds", result.getMaxSleepTimeMilliseconds()));
         result.setBaseSleepTimeMilliseconds(getProperty(props, 
"base.sleep.time.milliseconds", result.getBaseSleepTimeMilliseconds()));

Reply via email to