Automated cherry pick of #9297 #9401
Merged
Conversation
This file contains 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
In case syncWatchersLoop() starts before Restore() is called, watchers already added by that moment are moved to s.synced by the loop. However, there is a broken logic that moves watchers from s.synced to s.uncyned without setting keyWatchers of the watcherGroup. Eventually syncWatchers() fails to pickup those watchers from s.unsynced and no events are sent to the watchers, because newWatcherBatch() called in the function uses wg.watcherSetByKey() internally that requires a proper keyWatchers value.
|
I will add functional-tester to release 3.1 branch, for possible bbolt backports, tomorrow. |
|
Thanks @gyuho! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry pick of #9297 on release-3.1.
When discussing the rollback of etcd server from 3.2 to 3.1 for kubernetes 1.10 (kubernetes/kubernetes#60891), one of the concerns with etcd 3.1 was that it was missing this fix. The good news is that etcd 3.1 already contains all other critical fixes for kubernetes except this one.
We're aware that etcd 3.1 is no longer supported, but are hoping to get this fix in as it's considered critical and will be considerable help to the kubernetes community.
#9297: mvcc: restore unsynced watchers