0005530: Multi-homed clustered nodes stuck in loop of retry and resend

of batches
JumpMind · Oct 13, 2022 · 8a8d194 · 8a8d194
1 parent 7f704a7
commit 8a8d194
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -150,6 +150,7 @@
 import org.jumpmind.symmetric.service.INodeCommunicationService.INodeCommunicationExecutor;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IOutgoingBatchService;
+import org.jumpmind.symmetric.service.IParameterService;
 import org.jumpmind.symmetric.service.IRouterService;
 import org.jumpmind.symmetric.service.ISequenceService;
 import org.jumpmind.symmetric.service.ITransformService;
@@ -1202,8 +1203,10 @@ protected OutgoingBatch sendOutgoingBatch(ProcessInfo processInfo, Node targetNo
                     if (!isRetry && parameterService.is(ParameterConstants.OUTGOING_BATCH_COPY_TO_INCOMING_STAGING) &&
                             !parameterService.is(ParameterConstants.NODE_OFFLINE, false)) {
                         ISymmetricEngine targetEngine = AbstractSymmetricEngine.findEngineByUrl(targetNode.getSyncUrl());
-                        if (targetEngine != null && extractedBatch.isFileResource() && targetEngine.getParameterService().is(
-                                ParameterConstants.STREAM_TO_FILE_ENABLED)) {
+                        IParameterService targetParam = targetEngine.getParameterService();
+                        if (targetEngine != null && extractedBatch.isFileResource() && targetParam.is(ParameterConstants.STREAM_TO_FILE_ENABLED)
+                                && (!targetParam.is(ParameterConstants.CLUSTER_LOCKING_ENABLED) || targetParam.is(
+                                        ParameterConstants.CLUSTER_STAGING_ENABLED))) {
                             Node sourceNode = nodeService.findIdentity();
                             Node targetNodeByEngine = targetEngine.getNodeService().findIdentity();
                             if ((sourceNode != null && sourceNode.equals(targetNodeByEngine)) || (targetNodeByEngine != null && !targetNodeByEngine.equals(