Skip to content

Commit e6d3573

Browse files
zambrovskizambrovski
committed
make tests more stable - use seconds (instead of millis) for external task locking
1 parent 100b9f8 commit e6d3573

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
lines changed

‎engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/job/EmbeddedTaskDeliveryJobHandler.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class EmbeddedTaskDeliveryJobHandler(
6060
}
6161

6262
TYPE_SERVICE -> {
63-
val serviceTask = commandContext.fetchAndLockExternalTask(configuration.executionId, workerId, lockTimeInSeconds)
63+
val serviceTask = commandContext.fetchAndLockExternalTask(configuration.executionId, workerId, lockTimeInSeconds * 1000)
6464
logger.debug { "PROCESS-ENGINE-C7-EMBEDDED-023: Delivering external service task for execution ${configuration.executionId}, with task ${serviceTask.id}" }
6565
subscriptions.firstOrNull { subscription -> subscription.matches(serviceTask) }?.let { activeSubscription ->
6666
try {

‎engine-adapter/camunda-platform-7-embedded-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/task/delivery/pull/EmbeddedPullServiceTaskDelivery.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class EmbeddedPullServiceTaskDelivery(
2525
private val workerId: String,
2626
private val subscriptionRepository: SubscriptionRepository,
2727
private val maxTasks: Int,
28-
private val lockDuration: Long,
29-
private val retryTimeout: Long,
28+
private val lockDurationInSeconds: Long,
29+
private val retryTimeoutInSeconds: Long,
3030
private val retries: Int,
3131
private val executorService: ExecutorService
3232
) : ExternalServiceTaskDelivery, RefreshableDelivery {
@@ -59,7 +59,7 @@ class EmbeddedPullServiceTaskDelivery(
5959
} catch (e: Exception) {
6060
val jobRetries: Int = lockedTask.retries ?: retries
6161
logger.error { "PROCESS-ENGINE-C7-EMBEDDED-033: failing delivering task ${lockedTask.id}: ${e.message}" }
62-
externalTaskService.handleFailure(lockedTask.id, workerId, e.message, jobRetries - 1, retryTimeout)
62+
externalTaskService.handleFailure(lockedTask.id, workerId, e.message, jobRetries - 1, retryTimeoutInSeconds * 1000)
6363
subscriptionRepository.deactivateSubscriptionForTask(taskId = lockedTask.id)
6464
logger.error { "PROCESS-ENGINE-C7-EMBEDDED-034: successfully failed delivering task ${lockedTask.id}: ${e.message}" }
6565
}
@@ -77,9 +77,9 @@ class EmbeddedPullServiceTaskDelivery(
7777
.distinctBy { it.taskDescriptionKey }
7878
.forEach { subscription ->
7979
this
80-
.topic(subscription.taskDescriptionKey, lockDuration)
80+
.topic(subscription.taskDescriptionKey, lockDurationInSeconds * 1000)
8181
.enableCustomObjectDeserialization()
82-
// FIXME -> consider complex tent filtering
82+
// FIXME -> consider complex tenant filtering
8383
}
8484
return this
8585
}

‎engine-adapter/camunda-platform-7-embedded-core/src/test/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/process/C7EmbeddedProcessTestHelper.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class C7EmbeddedProcessTestHelper(private val processEngine: ProcessEngine) : Pr
3434
workerId = WORKER_ID,
3535
subscriptionRepository = subscriptionRepository,
3636
maxTasks = 100,
37-
lockDuration = 10L,
38-
retryTimeout = 10L,
37+
lockDurationInSeconds = 10L,
38+
retryTimeoutInSeconds = 10L,
3939
retries = 3,
4040
executorService = Executors.newFixedThreadPool(3)
4141
)

‎engine-adapter/camunda-platform-7-embedded-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/springboot/initial/C7EmbeddedInitialPullServiceTasksDeliveryBinding.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ open class C7EmbeddedInitialPullServiceTasksDeliveryBinding(
3737
externalTaskService = externalTaskService,
3838
workerId = c7AdapterProperties.serviceTasks.workerId,
3939
maxTasks = c7AdapterProperties.serviceTasks.maxTaskCount,
40-
lockDuration = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
41-
retryTimeout = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
40+
lockDurationInSeconds = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
41+
retryTimeoutInSeconds = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
4242
retries = c7AdapterProperties.serviceTasks.retries,
4343
executorService = executorService
4444
)

‎engine-adapter/camunda-platform-7-embedded-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/embedded/springboot/schedule/C7EmbeddedSchedulingAutoConfiguration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class C7EmbeddedSchedulingAutoConfiguration {
6767
externalTaskService = externalTaskService,
6868
workerId = c7AdapterProperties.serviceTasks.workerId,
6969
maxTasks = c7AdapterProperties.serviceTasks.maxTaskCount,
70-
lockDuration = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
71-
retryTimeout = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
70+
lockDurationInSeconds = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
71+
retryTimeoutInSeconds = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
7272
retries = c7AdapterProperties.serviceTasks.retries,
7373
executorService = executorService
7474
)

‎engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/pull/RemotePullServiceTaskDelivery.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class RemotePullServiceTaskDelivery(
2525
private val workerId: String,
2626
private val subscriptionRepository: SubscriptionRepository,
2727
private val maxTasks: Int,
28-
private val lockDuration: Long,
29-
private val retryTimeout: Long,
28+
private val lockDurationInSeconds: Long,
29+
private val retryTimeoutInSeconds: Long,
3030
private val retries: Int,
3131
private val executorService: ExecutorService
3232
) : ServiceTaskDelivery, RefreshableDelivery {
@@ -59,7 +59,7 @@ class RemotePullServiceTaskDelivery(
5959
} catch (e: Exception) {
6060
val jobRetries: Int = lockedTask.retries ?: retries
6161
logger.error { "PROCESS-ENGINE-C7-REMOTE-033: failing delivering task ${lockedTask.id}: ${e.message}" }
62-
externalTaskService.handleFailure(lockedTask.id, workerId, e.message, jobRetries - 1, retryTimeout)
62+
externalTaskService.handleFailure(lockedTask.id, workerId, e.message, jobRetries - 1, retryTimeoutInSeconds * 1000)
6363
logger.error { "PROCESS-ENGINE-C7-REMOTE-034: successfully failed delivering task ${lockedTask.id}: ${e.message}" }
6464
}
6565
}.get()
@@ -75,9 +75,9 @@ class RemotePullServiceTaskDelivery(
7575
.mapNotNull { it.taskDescriptionKey }
7676
.distinct()
7777
.forEach { topic ->
78-
this.topic(topic, lockDuration)
78+
this.topic(topic, lockDurationInSeconds * 1000) // lock
7979
.enableCustomObjectDeserialization()
80-
// FIXME -> consider complex tent filtering
80+
// FIXME -> consider complex tenant filtering
8181
}
8282
return this
8383
}

‎engine-adapter/camunda-platform-7-remote-core/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/task/delivery/subscribe/SubscribingClientServiceTaskDelivery.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ private val logger = KotlinLogging.logger {}
2121
class SubscribingClientServiceTaskDelivery(
2222
private val externalTaskClient: ExternalTaskClient,
2323
private val subscriptionRepository: SubscriptionRepository,
24-
private val lockDuration: Long,
25-
private val retryTimeout: Long,
24+
private val lockDurationInSeconds: Long,
25+
private val retryTimeoutInSeconds: Long,
2626
private val retries: Int,
2727
) : ServiceTaskDelivery {
2828

@@ -39,7 +39,7 @@ class SubscribingClientServiceTaskDelivery(
3939
// this is a job to subscribe to.
4040
camundaTaskListTopicSubscriptions.add(externalTaskClient
4141
.subscribe(subscription.taskDescriptionKey)
42-
.lockDuration(lockDuration)
42+
.lockDuration(lockDurationInSeconds * 1000)
4343
.handler { externalTask, externalTaskService ->
4444
if (subscription.matches(externalTask)) {
4545
subscriptionRepository.activateSubscriptionForTask(externalTask.id, subscription)
@@ -58,7 +58,7 @@ class SubscribingClientServiceTaskDelivery(
5858
"Error delivering external task",
5959
e.message,
6060
jobRetries - 1,
61-
retryTimeout
61+
retryTimeoutInSeconds * 1000
6262
)
6363
subscriptionRepository.deactivateSubscriptionForTask(taskId = externalTask.id)
6464
logger.error { "PROCESS-ENGINE-C7-REMOTE-034: successfully failed delivering task ${externalTask.id}: ${e.message}" }
@@ -70,7 +70,7 @@ class SubscribingClientServiceTaskDelivery(
7070
"PROCESS-ENGINE-C7-REMOTE-031: No matching handler",
7171
"",
7272
externalTask.retries, // no changes on retries
73-
retryTimeout
73+
retryTimeoutInSeconds * 1000
7474
)
7575
}
7676
}

‎engine-adapter/camunda-platform-7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/client/C7RemoteClientServiceTaskAutoConfiguration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class C7RemoteClientServiceTaskAutoConfiguration {
5050
c7AdapterProperties: C7RemoteAdapterProperties
5151
) = SubscribingClientServiceTaskDelivery(
5252
subscriptionRepository = subscriptionRepository,
53-
lockDuration = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
53+
lockDurationInSeconds = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
5454
externalTaskClient = externalTaskClient,
55-
retryTimeout = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
55+
retryTimeoutInSeconds = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
5656
retries = c7AdapterProperties.serviceTasks.retries
5757
)
5858

‎engine-adapter/camunda-platform-7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/initial/C7RemoteInitialPullServiceTasksDeliveryBinding.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ open class C7RemoteInitialPullServiceTasksDeliveryBinding(
3737
externalTaskService = externalTaskService,
3838
workerId = c7AdapterProperties.serviceTasks.workerId,
3939
maxTasks = c7AdapterProperties.serviceTasks.maxTaskCount,
40-
lockDuration = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
41-
retryTimeout = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
40+
lockDurationInSeconds = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
41+
retryTimeoutInSeconds = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
4242
retries = c7AdapterProperties.serviceTasks.retries,
4343
executorService = executorService
4444
)

‎engine-adapter/camunda-platform-7-remote-spring-boot-starter/src/main/kotlin/dev/bpmcrafters/processengineapi/adapter/c7/remote/springboot/schedule/C7RemoteSchedulingAutoConfiguration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ class C7RemoteSchedulingAutoConfiguration {
6868
externalTaskService = externalTaskService,
6969
workerId = c7AdapterProperties.serviceTasks.workerId,
7070
maxTasks = c7AdapterProperties.serviceTasks.maxTaskCount,
71-
lockDuration = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
72-
retryTimeout = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
71+
lockDurationInSeconds = c7AdapterProperties.serviceTasks.lockTimeInSeconds,
72+
retryTimeoutInSeconds = c7AdapterProperties.serviceTasks.retryTimeoutInSeconds,
7373
retries = c7AdapterProperties.serviceTasks.retries,
7474
executorService = executorService
7575
)

0 commit comments

Comments
 (0)