Fail lock acquisition if service already holds one.

dennisoelkers · dennisoelkers · commit 373850002905 · 2026-01-21T13:25:26.000+01:00
diff --git a/graylog2-server/src/main/java/org/graylog2/cluster/lock/RefreshingLockService.java b/graylog2-server/src/main/java/org/graylog2/cluster/lock/RefreshingLockService.java
@@ -85,6 +85,9 @@ public void acquireAndKeepLock(String resource, String lockContext) throws Alrea
     }
 
     private void scheduleLock(Lock newLock) {
+        if (lock != null) {
+            throw new IllegalStateException("Unable to acquire new lock, already holding lock that would get lost: " + lock);
+        }
         lock = newLock;
         Duration duration = lockTTL.minusSeconds(30);
         if (duration.isNegative() || duration.isZero()) {

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ public void acquireAndKeepLock(String resource, String lockContext) throws Alrea`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private void scheduleLock(Lock newLock) {`
	`88`	`+ if (lock != null) {`
	`89`	`+ throw new IllegalStateException("Unable to acquire new lock, already holding lock that would get lost: " + lock);`
	`90`	`+ }`
`88`	`91`	`lock = newLock;`
`89`	`92`	`Duration duration = lockTTL.minusSeconds(30);`
`90`	`93`	`if (duration.isNegative() \|\| duration.isZero()) {`