Fixes lock check for prune exclude actions#6077
Open
ddanielr wants to merge 3 commits intoapache:2.1from
Open
Conversation
Correctly checks the lock format so that exclude options for the prune command work correctly.
ddanielr
commented
Jan 26, 2026
| if (parts.length == 2 && hostPortPredicate.test(HostAndPort.fromString(parts[1]))) { | ||
| messageOutput.accept("Deleting " + path + " from zookeeper"); | ||
| if (!dryRun) { | ||
| zoo.recursiveDelete(path, NodeMissingPolicy.SKIP); |
Contributor
Author
There was a problem hiding this comment.
The original SingletonLock code uses zapDirectory(zoo, path, ops) which just performs a recursive delete on the path after printing a log message.
| throws KeeperException, InterruptedException { | ||
| var lockData = ServiceLock.getLockData(zoo.getZooKeeper(), ServiceLock.path(path)); | ||
| if (lockData != null) { | ||
| String lockContent = new String(lockData, UTF_8); |
Contributor
There was a problem hiding this comment.
Could the ServerServices code be used here to extract the address? Like this code
Contributor
Author
There was a problem hiding this comment.
Yes that would probably work. I'll look at making that change so we aren't going down multiple lock removal paths again
Contributor
Author
|
Pushing this change up for now. Going to see if ServerServices can be used to consolidate more of the lock code. |
Contributor
|
The code in main is sufficiently different. I don't think the changes here or in #6073 should be merged to main. |
dlmarion
approved these changes
Jan 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Correctly checks the lock format so that exclude options for the prune command work correctly.
Closes #6076