Skip to content

Consolidates the ServerLock deletion code #6065

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

Jump to bottom
Merged
ddanielr merged 2 commits into from
Jan 20, 2026
Merged

Consolidates the ServerLock deletion code #6065

ddanielr merged 2 commits into from
Jan 20, 2026
+51 −15

Conversation

@ddanielr
Copy link
Contributor

@ddanielr ddanielr commented Jan 17, 2026

Modifies ZooZap to use the same deletion logic as
ServiceLock.

This PR contains just the zlock consolidation commit from #6049.

@ddanielr
Consolidates the ServerLock deletion code
0b953c5 
Modifies ZooZap to use the same deletion logic as
ServiceLock.
@ddanielr ddanielr added this to the 2.1.5 milestone Jan 17, 2026
dlmarion
dlmarion reviewed Jan 20, 2026
View reviewed changes
Copy link
Contributor

@dlmarion dlmarion left a comment

Choose a reason for hiding this comment

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

Initial review.

@ddanielr
Adds input validation and removes all locks
df69647 
Adds input path validation to deleteLocks and ensures that all locks are
removed for a given server location.

Cannot use deleteLock as that only deletes the first child lock for a
given path.
@ddanielr ddanielr merged commit e689a8f into apache:2.1 Jan 20, 2026
8 checks passed
@ddanielr ddanielr deleted the refactor/consolidate-zlock-code branch January 20, 2026 15:51
@ddanielr
Copy link
Contributor Author

ddanielr commented Jan 20, 2026

merged this into main using a no-opt merge as the merge conflicts were excessive.
Will need to open a separate PR against main to include these changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dlmarion dlmarion dlmarion approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.1.5

Development

Successfully merging this pull request may close these issues.

2 participants

@ddanielr @dlmarion