This is an automated email from the ASF dual-hosted git repository.

sergehuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d416eede Wait for the scheduler to release a cluster lock before 
asserting it (#972)
1d416eede is described below

commit 1d416eeded93bf03f479912314cf64f16605fddb
Author: Serge Huber <[email protected]>
AuthorDate: Fri Nov 20 19:44:33 2026 +0100

    Wait for the scheduler to release a cluster lock before asserting it (#972)
---
 .../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();

Reply via email to