0004920: Initial load blocking

JumpMind · Apr 6, 2021 · f7e1328 · f7e1328
1 parent 6300540
commit f7e1328
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -2011,7 +2011,12 @@ public void resetExtractRequest(OutgoingBatch batch) {
 
     public ExtractRequest requestExtractRequest(ISqlTransaction transaction, String nodeId, String queue,
             TriggerRouter triggerRouter, long startBatchId, long endBatchId, long loadId, String table, long rows, long parentRequestId) {
-        long requestId = sequenceService.nextVal(transaction, Constants.SEQUENCE_EXTRACT_REQ);
+        long requestId = 0;
+        if (platform.supportsMultiThreadedTransactions()) {
+            requestId = sequenceService.nextVal(Constants.SEQUENCE_EXTRACT_REQ);
+        } else {
+            requestId = sequenceService.nextVal(transaction, Constants.SEQUENCE_EXTRACT_REQ);
+        }
         transaction.prepareAndExecute(getSql("insertExtractRequestSql"),
                 new Object[] { requestId, nodeId, queue, ExtractStatus.NE.name(), startBatchId,
                         endBatchId, triggerRouter.getTrigger().getTriggerId(),

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -910,7 +910,11 @@ public Map<Integer, ExtractRequest> insertReloadEvents(Node targetNode, boolean
                         transaction = platform.getSqlTemplate().startSqlTransaction();
 
                         if (loadId == 0) {
-                            loadId = engine.getSequenceService().nextVal(transaction, Constants.SEQUENCE_OUTGOING_BATCH_LOAD_ID);
+                            if (platform.supportsMultiThreadedTransactions()) {
+                                loadId = engine.getSequenceService().nextVal(Constants.SEQUENCE_OUTGOING_BATCH_LOAD_ID);
+                            } else {
+                                loadId = engine.getSequenceService().nextVal(transaction, Constants.SEQUENCE_OUTGOING_BATCH_LOAD_ID);
+                            }
                         }
 
                         processInfo.setCurrentLoadId(loadId);