Skip to content

Fix stale server status in lifecycle statistics by using getDirectly() instead of get() #2529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix stale server status in lifecycle statistics by using getDirectly() instead of get() #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private boolean isAllDisabled(final JobNodePath jobNodePath) {
List<String> serversPath = regCenter.getChildrenKeys(jobNodePath.getServerNodePath());
int disabledServerCount = 0;
for (String each : serversPath) {
if (JobBriefInfo.JobStatus.DISABLED.name().equals(regCenter.get(jobNodePath.getServerNodePath(each)))) {
if (JobBriefInfo.JobStatus.DISABLED.name().equals(regCenter.getDirectly(jobNodePath.getServerNodePath(each)))) {
disabledServerCount++;
}
}
Expand Down Expand Up @@ -147,7 +147,7 @@ private JobBriefInfo getJobBriefInfoByJobNameAndIp(final String jobName, final S

private JobBriefInfo.JobStatus getJobStatusByJobNameAndIp(final String jobName, final String ip) {
JobNodePath jobNodePath = new JobNodePath(jobName);
String status = regCenter.get(jobNodePath.getServerNodePath(ip));
String status = regCenter.getDirectly(jobNodePath.getServerNodePath(ip));
if ("DISABLED".equalsIgnoreCase(status)) {
return JobBriefInfo.JobStatus.DISABLED;
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...ache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Collection<ServerBriefInfo> getAllServersBriefInfo() {
for (String each : regCenter.getChildrenKeys(jobNodePath.getServerNodePath())) {
servers.putIfAbsent(each, new ServerBriefInfo(each));
ServerBriefInfo serverInfo = servers.get(each);
if ("DISABLED".equalsIgnoreCase(regCenter.get(jobNodePath.getServerNodePath(each)))) {
if ("DISABLED".equalsIgnoreCase(regCenter.getDirectly(jobNodePath.getServerNodePath(each)))) {
serverInfo.getDisabledJobsNum().incrementAndGet();
}
serverInfo.getJobNames().add(jobName);
Expand Down
8 changes: 4 additions & 4 deletions ...che/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void assertGetOKJobBriefInfo() {
void assertGetOKJobBriefInfoWithPartialDisabledServer() {
when(regCenter.getDirectly("/test_job/config")).thenReturn(LifecycleYamlConstants.getSimpleJobYaml("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.get("/test_job/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
when(regCenter.getChildrenKeys("/test_job/sharding")).thenReturn(Arrays.asList("0", "1"));
when(regCenter.get("/test_job/sharding/0/instance")).thenReturn("ip1@-@defaultInstance");
Expand All @@ -90,8 +90,8 @@ void assertGetOKJobBriefInfoWithPartialDisabledServer() {
void assertGetDisabledJobBriefInfo() {
when(regCenter.getDirectly("/test_job/config")).thenReturn(LifecycleYamlConstants.getSimpleJobYaml("test_job", "desc"));
when(regCenter.getChildrenKeys("/test_job/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.get("/test_job/servers/ip1")).thenReturn("DISABLED");
when(regCenter.get("/test_job/servers/ip2")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job/servers/ip2")).thenReturn("DISABLED");
when(regCenter.getChildrenKeys("/test_job/instances")).thenReturn(Arrays.asList("ip1@-@defaultInstance", "ip2@-@defaultInstance"));
JobBriefInfo jobBrief = jobStatisticsAPI.getJobBriefInfo("test_job");
assertThat(jobBrief.getStatus(), is(JobBriefInfo.JobStatus.DISABLED));
Expand Down Expand Up @@ -155,7 +155,7 @@ void assertGetJobsBriefInfoByIp() {
when(regCenter.getChildrenKeys("/")).thenReturn(Arrays.asList("test_job_1", "test_job_2", "test_job_3"));
when(regCenter.isExisted("/test_job_1/servers/ip1")).thenReturn(true);
when(regCenter.isExisted("/test_job_2/servers/ip1")).thenReturn(true);
when(regCenter.get("/test_job_2/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job_2/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getChildrenKeys("/test_job_1/instances")).thenReturn(Collections.singletonList("ip1@-@defaultInstance"));
when(regCenter.get("/test_job_1/instances/ip1@-@defaultInstance")).thenReturn("jobInstanceId: ip1@-@defaultInstance\nserverIp: ip1\n");
int i = 0;
Expand Down
8 changes: 4 additions & 4 deletions .../shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ void assertGetAllServersBriefInfo() {
when(regCenter.getChildrenKeys("/")).thenReturn(Arrays.asList("test_job1", "test_job2"));
when(regCenter.getChildrenKeys("/test_job1/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.getChildrenKeys("/test_job2/servers")).thenReturn(Arrays.asList("ip1", "ip2"));
when(regCenter.get("/test_job1/servers/ip1")).thenReturn("DISABLED");
when(regCenter.get("/test_job1/servers/ip2")).thenReturn("");
when(regCenter.getDirectly("/test_job1/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job1/servers/ip2")).thenReturn("");
when(regCenter.getChildrenKeys("/test_job1/instances")).thenReturn(Collections.singletonList("ip1@-@defaultInstance"));

when(regCenter.get("/test_job2/servers/ip1")).thenReturn("DISABLED");
when(regCenter.get("/test_job2/servers/ip2")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job2/servers/ip1")).thenReturn("DISABLED");
when(regCenter.getDirectly("/test_job2/servers/ip2")).thenReturn("DISABLED");
when(regCenter.get("/test_job1/instances/ip1@-@defaultInstance")).thenReturn("jobInstanceId: ip1@-@defaultInstance\nserverIp: ip1\n");
when(regCenter.get("/test_job2/instances/ip1@-@defaultInstance")).thenReturn("jobInstanceId: ip1@-@defaultInstance\nserverIp: ip1\n");
when(regCenter.get("/test_job2/instances/ip2@-@defaultInstance2")).thenReturn("jobInstanceId: ip2@-@defaultInstance2\nserverIp: ip2\n");
Expand Down