This is an automated email from the ASF dual-hosted git repository. sergehuber pushed a commit to branch fix-scheduler-lock-release-race in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 058230a04cb2a1cc21e978e5c20d7f529a9e9f33 Author: Serge Huber <[email protected]> AuthorDate: Fri Nov 20 16:05:09 2026 +0100 Wait for the scheduler to release a cluster lock before asserting it. testClusteringSupport cleared the lock in persistence while the task was still running. The executor could write its lock owner again after that save, so the next load still saw the node id. --- .../impl/scheduler/SchedulerServiceImplTest.java | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/services/src/test/java/org/apache/unomi/services/impl/scheduler/SchedulerServiceImplTest.java b/services/src/test/java/org/apache/unomi/services/impl/scheduler/SchedulerServiceImplTest.java index 0521f476b..a1bb6c61a 100644 --- a/services/src/test/java/org/apache/unomi/services/impl/scheduler/SchedulerServiceImplTest.java +++ b/services/src/test/java/org/apache/unomi/services/impl/scheduler/SchedulerServiceImplTest.java @@ -625,17 +625,21 @@ public class SchedulerServiceImplTest { assertNotNull(lockedTask.getLockOwner(), "Task should have lock owner"); assertNotNull(lockedTask.getLockDate(), "Task should have lock date"); - // Test lock release - directly update task in persistence - lockedTask.setLockOwner(null); - lockedTask.setLockDate(null); - lockedTask.setLockLeaseMillis(0); - persistenceService.save(lockedTask); - - // Refresh index to ensure changes are visible - persistenceService.refreshIndex(ScheduledTask.class); - - // Get latest state and verify lock release - ScheduledTask releasedTask = persistenceService.load(lockTask.getItemId(), ScheduledTask.class); + // Let the task finish so the scheduler releases the lock. Clearing the lock in + // persistence while the executor is still running races that write: the executor + // can persist its lock owner again after the test's save, and the next load still + // sees the node id. + lockTaskRelease.countDown(); + ScheduledTask releasedTask = null; + long releaseDeadline = System.currentTimeMillis() + TEST_TIMEOUT; + while (System.currentTimeMillis() < releaseDeadline) { + releasedTask = persistenceService.load(lockTask.getItemId(), ScheduledTask.class); + if (releasedTask != null && releasedTask.getLockOwner() == null) { + break; + } + Thread.sleep(100); + } + assertNotNull(releasedTask, "Lock task should still be persisted"); assertNull(releasedTask.getLockOwner(), "Lock should be released"); } finally { lockTaskRelease.countDown();
