Skip to content

Fail lock acquisition if service already holds one. #24782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrickmann merged 6 commits into from
Mar 12, 2026
+123 −10
Merged

Fail lock acquisition if service already holds one. #24782

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3738500
Fail lock acquisition if service already holds one.
dennisoelkers Jan 21, 2026
b79ee69
Merge branch 'master' into refactor/fail-lock-acquisition-if-factory-…
dennisoelkers Jan 22, 2026
6f1eb13
Add test coverage for IllegalStateException on duplicate lock acquisi…
Copilot Mar 10, 2026
b8ec0d3
Merge branch 'master' into refactor/fail-lock-acquisition-if-factory-…
dennisoelkers Mar 10, 2026
dee1f05
Merge branch 'master' into refactor/fail-lock-acquisition-if-factory-…
dennisoelkers Mar 10, 2026
89add0b
Pulling up check for pre-existing lock, using idiomatic optional hand…
dennisoelkers Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions graylog2-server/src/main/java/org/graylog2/cluster/lock/RefreshingLockService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Copy link

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new lock validation logic should be covered by a test case that verifies the IllegalStateException is thrown when attempting to schedule a lock while already holding one.

Copilot uses AI. Check for mistakes.
Copy link
Member Author

@dennisoelkers dennisoelkers Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot: Please implement a test like that.

lock = newLock;
Duration duration = lockTTL.minusSeconds(30);
if (duration.isNegative() || duration.isZero()) {
Expand Down
Loading