ZOOKEEPER-4472: Remove persistent watches individually #2006
Merged
tisonkun merged 3 commits intoJun 15, 2023
Merged
Conversation
kezhuw
changed the title
kezhuw
force-pushed
the
ZOOKEEPER-4472-remove-persistent-watchers-individually
branch
from
June 13, 2023 11:02
cd11e2b to
cecc2ea
Compare
Member
Author
|
ReadOnlyModeTest.testConnectionEvents failed. There are candidates to fix this #1667 and #1896. |
ZOOKEEPER-4466 supports different watch modes one same path, but there are no corresponding `WatcherType`s for persistent watches. Client has to resort to `WatcherType.Any` to remove them. This could accidently interrupt other watches. This PR adds `WatcherType.Persistent` and `WatcherType.PersistentRecursive` to remove persistent watches individually.
kezhuw
force-pushed
the
ZOOKEEPER-4472-remove-persistent-watchers-individually
branch
from
June 13, 2023 13:23
421d0ab to
83d3ea9
Compare
tisonkun
self-requested a review
June 13, 2023 13:24
tisonkun
reviewed
Jun 13, 2023
| synchronized (childWatches) { | ||
| containsWatcher = contains(path, watcher, childWatches); | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
I agree on this direction that it delivers more reasonable behaviors. But it can somehow still a user-facing manner changes. Maybe we need a release note to describe it.
I'll check the final logic tomorrow and give a review result :D
Member
Author
There was a problem hiding this comment.
Here are my findings:
containsWatcheris package private and used solely byZKWatchManager::removeWatcher.removeWatcherenforces more stringentNoWatcherExceptioncheck thancontainsWatcher.
So, we are in lucking path that partially removing WatcherType::Data from AddWatchMode::Persistent is an error even it is permitted by server side(a.k.a rc is 0) and containsWatcher.
I pushed a test commit for this. I also pushed tests in kezhuw@8c35fce before ZOOKEEPER-4466. All these tests result in NOWATCHER when removing WatcherType::Data from AddWatchMode::Persistent.
Member
Author
There was a problem hiding this comment.
I have add "Release Note" to ZOOKEEPER-4466, ZOOKEEPER-4471 and ZOOKEEPER-4472.
Is that sufficient for us ? @eolivelli @tisonkun @anmolnar
tisonkun
self-requested a review
June 15, 2023 04:56
Member
|
Merging... |
Contributor
|
For the release notes the release manager should write it in the news page. |
anurag-harness
pushed a commit
to anurag-harness/zookeeper
that referenced
this pull request
Aug 31, 2023
* ZOOKEEPER-4472: Remove persistent watches individually ZOOKEEPER-4466 supports different watch modes one same path, but there are no corresponding `WatcherType`s for persistent watches. Client has to resort to `WatcherType.Any` to remove them. This could accidently interrupt other watches. This PR adds `WatcherType.Persistent` and `WatcherType.PersistentRecursive` to remove persistent watches individually. * Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible * fixup! Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible
anurag-harness
added a commit
to anurag-harness/zookeeper
that referenced
this pull request
Aug 31, 2023
…53) * ZOOKEEPER-4472: Remove persistent watches individually ZOOKEEPER-4466 supports different watch modes one same path, but there are no corresponding `WatcherType`s for persistent watches. Client has to resort to `WatcherType.Any` to remove them. This could accidently interrupt other watches. This PR adds `WatcherType.Persistent` and `WatcherType.PersistentRecursive` to remove persistent watches individually. * Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible * fixup! Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible Co-authored-by: Kezhu Wang <kezhuw@gmail.com>
rahulrane50
pushed a commit
to rahulrane50/zookeeper
that referenced
this pull request
Sep 15, 2023
* ZOOKEEPER-4472: Remove persistent watches individually ZOOKEEPER-4466 supports different watch modes one same path, but there are no corresponding `WatcherType`s for persistent watches. Client has to resort to `WatcherType.Any` to remove them. This could accidently interrupt other watches. This PR adds `WatcherType.Persistent` and `WatcherType.PersistentRecursive` to remove persistent watches individually. * Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible * fixup! Assert removing WatcherType::Data from AddWatchMode::Persistent is impossible
kezhuw
deleted the
ZOOKEEPER-4472-remove-persistent-watchers-individually
branch
September 24, 2023 15:07
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.
ZOOKEEPER-4466 supports different watch modes one same path, but there are no corresponding
WatcherTypes for persistent watches. Client has to resort toWatcherType.Anyto remove them. This could accidently interrupt other watches.This PR adds
WatcherType.PersistentandWatcherType.PersistentRecursiveto remove persistent watches individually.Besides above, this pr bases on #1998.