fix: Locking single job for project

tolgee · Jul 28, 2023 · 40f9d51 · 40f9d51
1 parent 9be6b4d
commit 40f9d51
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt b/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt
@@ -337,6 +337,7 @@ abstract class AbstractBatchJobsGeneralTest : AbstractSpringTest(), Logging {
   @Test
   fun `it locks the single job for project`() {
     logger.info("Running test: it locks the single job for project")
+    currentDateProvider.forcedDate = null
     batchJobConcurrentLauncher.pause = true
 
     val job1 = runChunkedJob(20)

diff --git a/backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt b/backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt
@@ -149,7 +149,13 @@ class BatchJobConcurrentLauncher(
       )
 
       // we haven't publish consuming, so we can add it only to the local queue
-      batchJobChunkExecutionQueue.addItemsToLocalQueue(listOf(executionItem))
+      batchJobChunkExecutionQueue.addItemsToLocalQueue(
+        listOf(
+          executionItem.also {
+            it.executeAfter = currentDateProvider.date.time + 1000
+          }
+        )
+      )
       return
     }
 

diff --git a/backend/data/src/main/kotlin/io/tolgee/batch/ExecutionQueueItem.kt b/backend/data/src/main/kotlin/io/tolgee/batch/ExecutionQueueItem.kt
@@ -3,5 +3,5 @@ package io.tolgee.batch
 data class ExecutionQueueItem(
   val chunkExecutionId: Long,
   val jobId: Long,
-  val executeAfter: Long?
+  var executeAfter: Long?
 )