Merge pull request #145 from VerstraeteBert/fix-pg-create-tasks

Fix: Wrap PGExecutionDAO createTasks in a single transaction
conductor-oss · May 9, 2024 · 8d8588c · 8d8588c
2 parents e669ab9 + cad47f4
commit 8d8588c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...es-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresExecutionDAO.java b/...es-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresExecutionDAO.java
@@ -136,9 +136,10 @@ private static String taskKey(TaskModel task) {
     public List<TaskModel> createTasks(List<TaskModel> tasks) {
         List<TaskModel> created = Lists.newArrayListWithCapacity(tasks.size());
 
-        for (TaskModel task : tasks) {
-            withTransaction(
-                    connection -> {
+        withTransaction(
+                connection -> {
+                    for (TaskModel task : tasks) {
+
                         validate(task);
 
                         task.setScheduledTime(System.currentTimeMillis());
@@ -155,7 +156,7 @@ public List<TaskModel> createTasks(List<TaskModel> tasks) {
                                             + task.getReferenceTaskName()
                                             + ", key="
                                             + taskKey);
-                            return;
+                            continue;
                         }
 
                         insertOrUpdateTaskData(connection, task);
@@ -164,8 +165,8 @@ public List<TaskModel> createTasks(List<TaskModel> tasks) {
                         updateTask(connection, task);
 
                         created.add(task);
-                    });
-        }
+                    }
+                });
 
         return created;
     }