You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/08 15:32:18 UTC
[shardingsphere-elasticjob-lite] branch master updated: Fix
JobOperateAPIImpl#enable bug (#996) (#997)
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-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 184b317 Fix JobOperateAPIImpl#enable bug (#996) (#997)
184b317 is described below
commit 184b317be23ad5e00b309aaec4380c3f1914af25
Author: Tboy <gu...@immomo.com>
AuthorDate: Wed Jul 8 23:32:04 2020 +0800
Fix JobOperateAPIImpl#enable bug (#996) (#997)
---
.../lite/lifecycle/internal/operate/JobOperateAPIImpl.java | 9 +++++----
.../lite/lifecycle/internal/operate/JobOperateAPIImplTest.java | 10 +++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/elastic-job-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImpl.java b/elastic-job-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImpl.java
index 0408696..bd021b8 100644
--- a/elastic-job-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImpl.java
+++ b/elastic-job-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImpl.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.elasticjob.lite.lifecycle.internal.operate;
import com.google.common.base.Preconditions;
+import org.apache.shardingsphere.elasticjob.lite.internal.server.ServerStatus;
import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobOperateAPI;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
@@ -62,9 +63,9 @@ public final class JobOperateAPIImpl implements JobOperateAPI {
JobNodePath jobNodePath = new JobNodePath(jobName);
for (String each : regCenter.getChildrenKeys(jobNodePath.getServerNodePath())) {
if (disabled) {
- regCenter.persist(jobNodePath.getServerNodePath(each), "DISABLED");
+ regCenter.persist(jobNodePath.getServerNodePath(each), ServerStatus.DISABLED.name());
} else {
- regCenter.persist(jobNodePath.getServerNodePath(each), "");
+ regCenter.persist(jobNodePath.getServerNodePath(each), ServerStatus.ENABLED.name());
}
}
} else {
@@ -81,9 +82,9 @@ public final class JobOperateAPIImpl implements JobOperateAPI {
JobNodePath jobNodePath = new JobNodePath(jobName);
String serverNodePath = jobNodePath.getServerNodePath(serverIp);
if (disabled) {
- regCenter.persist(serverNodePath, "DISABLED");
+ regCenter.persist(serverNodePath, ServerStatus.DISABLED.name());
} else {
- regCenter.persist(serverNodePath, "");
+ regCenter.persist(serverNodePath, ServerStatus.ENABLED.name());
}
}
diff --git a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
index 4a37d4c..4c279e6 100644
--- a/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
+++ b/elastic-job-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/JobOperateAPIImplTest.java
@@ -84,7 +84,7 @@ public final class JobOperateAPIImplTest {
@Test
public void assertEnableWithJobNameAndServerIp() {
jobOperateAPI.enable("test_job", "localhost");
- verify(regCenter).persist("/test_job/servers/localhost", "");
+ verify(regCenter).persist("/test_job/servers/localhost", "ENABLED");
}
@Test
@@ -92,8 +92,8 @@ public final class JobOperateAPIImplTest {
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
jobOperateAPI.enable("test_job", null);
verify(regCenter).getChildrenKeys("/test_job/servers");
- verify(regCenter).persist("/test_job/servers/ip1", "");
- verify(regCenter).persist("/test_job/servers/ip2", "");
+ verify(regCenter).persist("/test_job/servers/ip1", "ENABLED");
+ verify(regCenter).persist("/test_job/servers/ip2", "ENABLED");
}
@Test
@@ -103,8 +103,8 @@ public final class JobOperateAPIImplTest {
when(regCenter.isExisted("/test_job2/servers/localhost")).thenReturn(true);
jobOperateAPI.enable(null, "localhost");
verify(regCenter).getChildrenKeys("/");
- verify(regCenter).persist("/test_job1/servers/localhost", "");
- verify(regCenter).persist("/test_job2/servers/localhost", "");
+ verify(regCenter).persist("/test_job1/servers/localhost", "ENABLED");
+ verify(regCenter).persist("/test_job2/servers/localhost", "ENABLED");
}
@Test