issue-2429 failover node exist also remove running node,prevent execu…

…te dead loop
apache · Aug 18, 2024 · af538c4 · af538c4
1 parent d14bae2
commit af538c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...rg/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java b/...rg/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java
@@ -97,6 +97,7 @@ public void onChange(final DataChangedEvent event) {
                 if (!failoverItems.isEmpty()) {
                     for (int each : failoverItems) {
                         failoverService.setCrashedFailoverFlagDirectly(each);
+                        executionService.clearRunningInfo(Collections.singletonList(each));
                         failoverService.failoverIfNecessary();
                     }
                 } else {

diff --git a/...pache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java b/...pache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java
@@ -26,6 +26,7 @@
 import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
 import org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
 import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService;
+import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingNode;
 import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
 import org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage;
 import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
@@ -157,6 +158,7 @@ void assertJobCrashedJobListenerWhenIsOtherFailoverInstanceCrashed() {
         when(instanceNode.getInstanceFullPath()).thenReturn("/test_job/instances");
         failoverListenerManager.new JobCrashedJobListener().onChange(new DataChangedEvent(Type.DELETED, "/test_job/instances/127.0.0.1@-@1", ""));
         verify(failoverService).setCrashedFailoverFlagDirectly(1);
+        verify(executionService).clearRunningInfo(Collections.singletonList(1));
         verify(failoverService).failoverIfNecessary();
         JobRegistry.getInstance().shutdown("test_job");
     }