Automated cherry pick of #9281 #9297
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.
|
cc @gyuho |
|
#9065 was merged after 3.3 release branch, so the LGTM after CI greens. Thanks! |
|
Test fixed. Waiting on CI. |
This was referenced Mar 8, 2018
gyuho
added a commit
that referenced
this pull request
Mar 8, 2018
…rigin-release-3.1 Automated cherry pick of #9297
This was referenced Mar 8, 2018
k8s-github-robot
pushed a commit
to kubernetes/kubernetes
that referenced
this pull request
Mar 13, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars
k8s-publishing-bot
added a commit
to kubernetes/sample-apiserver
that referenced
this pull request
Mar 13, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars Kubernetes-commit: b651ed5ea7331139fc39ea84a55b0261c6b3f000
k8s-publishing-bot
added a commit
to kubernetes/apiextensions-apiserver
that referenced
this pull request
Mar 13, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars Kubernetes-commit: b651ed5ea7331139fc39ea84a55b0261c6b3f000
sttts
pushed a commit
to sttts/sample-apiserver
that referenced
this pull request
Mar 16, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars Kubernetes-commit: b651ed5ea7331139fc39ea84a55b0261c6b3f000
sttts
pushed a commit
to sttts/apiextensions-apiserver
that referenced
this pull request
Mar 16, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars Kubernetes-commit: b651ed5ea7331139fc39ea84a55b0261c6b3f000
openshift-publish-robot
pushed a commit
to openshift/kubernetes-sample-apiserver
that referenced
this pull request
Jan 14, 2019
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump to etcd 3.1.12 to pick up critical fix etcd [3.1.12](https://github.com/coreos/etcd/releases/tag/v3.1.12) (as well as 3.2.17 and 3.3.2) was released yesterday to fix a bug critical to kubernetes: Fix [mvcc "unsynced" watcher restore operation](etcd-io/etcd#9297). - "unsynced" watcher is watcher that needs to be in sync with events that have happened. - That is, "unsynced" watcher is the slow watcher that was requested on old revision. - "unsynced" watcher restore operation was not correctly populating its underlying watcher group. - Which possibly causes [missing events from "unsynced" watchers](etcd-io/etcd#9086). This will be backported to 1.9 as well. Release note: ```release-note Upgrade the default etcd server version to 3.1.12 to pick up critical etcd "mvcc "unsynced" watcher restore operation" fix. ``` cc @gyuho @wojtek-t @shyamjvs @timothysc @jdumars Kubernetes-commit: b651ed5ea7331139fc39ea84a55b0261c6b3f000
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 #9281 on release-3.2.
#9281: mvcc: restore unsynced watchers