0003318: common batches can get corrupted because of 0003275 and 0003282

JumpMind · Nov 16, 2017 · 215ebf5 · 215ebf5
1 parent 0de299c
commit 215ebf5
Showing 1 changed file with 5 additions and 3 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
@@ -868,12 +868,13 @@ protected OutgoingBatch extractOutgoingBatch(ProcessInfo processInfo, Node targe
             if (currentBatch.getStatus() == Status.IG) {
                 cleanupIgnoredBatch(sourceNode, targetNode, currentBatch, writer);
             } else if (!isPreviouslyExtracted(currentBatch, true)) {
-
                 BatchLock lock = null;
                 try {
+                    log.debug("{} attempting to acquire lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                     lock = acquireLock(currentBatch, useStagingDataWriter);
-
+                    log.debug("{} acquired lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                     if (!isPreviouslyExtracted(currentBatch, true)) {
+                        log.debug("{} extracting batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                         currentBatch.setExtractCount(currentBatch.getExtractCount() + 1);
                         if (updateBatchStatistics) {
                             changeBatchStatus(Status.QY, currentBatch, mode);
@@ -910,12 +911,13 @@ protected OutgoingBatch extractOutgoingBatch(ProcessInfo processInfo, Node targe
                         resource.delete();
                     }
                     throw ex;
-                } finally {
+                } finally {                    
                     IStagedResource resource = getStagedResource(currentBatch);
                     if (resource != null) {
                         resource.setState(State.DONE);
                     }
                     releaseLock(lock, currentBatch, useStagingDataWriter);
+                    log.debug("{} released lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                 }
             }