0003476: When a node is unregistered cancel all jobs / threads that are

actively doing work for that node
JumpMind · Jun 5, 2023 · fdc6c88 · fdc6c88
1 parent 6f35c97
commit fdc6c88
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -51,6 +51,7 @@
 import org.jumpmind.symmetric.model.NodeHost;
 import org.jumpmind.symmetric.model.NodeSecurity;
 import org.jumpmind.symmetric.model.NodeStatus;
+import org.jumpmind.symmetric.model.ProcessInfo;
 import org.jumpmind.symmetric.security.INodePasswordFilter;
 import org.jumpmind.symmetric.service.FilterCriterion;
 import org.jumpmind.symmetric.service.FilterCriterion.FilterOption;
@@ -208,6 +209,13 @@ public void updateNodeHostForCurrentNode() {
     }
 
     public void deleteNode(String nodeId, boolean syncChange) {
+        log.info("Unregistering node {} and removing it from database", nodeId);
+        for (ProcessInfo info : engine.getStatisticManager().getProcessInfos()) {
+            if (info.getTargetNodeId() != null && info.getTargetNodeId().equals(nodeId)) {
+                log.info("Sending interrupt to " + info.getKey() + ",batchId=" + info.getCurrentBatchId());
+                info.getThread().interrupt();
+            }
+        }
         ISqlTransaction transaction = null;
         try {
             transaction = sqlTemplate.startSqlTransaction();