Skip to content
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.

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

UPSTREAM: 58547: Send correct resource version for delete events from watch cache #18233

Conversation

tnozicka
Copy link
Contributor

Backport of kubernetes/kubernetes#58547

Watch cache was returning incorrect (old) ResourceVersion on "deleted" events breaking informers that were going back in time. This fixes it.

/assign @liggitt
/cc @mfojtik

Fixes #17581 #16003 and likely others

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 23, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Jan 23, 2018
@tnozicka tnozicka added kind/bug Categorizes issue or PR as related to a bug. priority/P0 priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. labels Jan 23, 2018
@tnozicka
Copy link
Contributor Author

/test cmd

@liggitt
Copy link
Contributor

liggitt commented Jan 23, 2018

can you also pick to 3.8 and 3.7 (origin and ose)? picking from the cherry-pick PRs upstream should avoid conflicts

@tnozicka
Copy link
Contributor Author

@liggitt I was about to ask you from which version we enabled the cache; now I know :)

@tnozicka
Copy link
Contributor Author

tnozicka commented Jan 23, 2018

/cherrypick release-3.8
(let's see if it works first)

@openshift-cherrypick-robot

@tnozicka: once the present PR merges, I will cherry-pick it on top of release-3.8 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tnozicka
Copy link
Contributor Author

/test cmd

@tnozicka
Copy link
Contributor Author

/cherrypick release-3.7
(let's see if it works first)

@openshift-cherrypick-robot

@tnozicka: once the present PR merges, I will cherry-pick it on top of release-3.7
in a new PR and assign it to you.

In response to this:

/cherrypick release-3.7
(let's see if it works first)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tnozicka
Copy link
Contributor Author

/test extended_conformance_install

@liggitt
Copy link
Contributor

liggitt commented Jan 23, 2018

(let's see if it works first)

it won't... there were conflicts. pick the upstream cherry picks

@liggitt
Copy link
Contributor

liggitt commented Jan 23, 2018

@liggitt I was about to ask you from which version we enabled the cache; now I know :)

we enabled it before that, but that's as far back as I'd pick this for now

@liggitt
Copy link
Contributor

liggitt commented Jan 23, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, tnozicka

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@tnozicka
Copy link
Contributor Author

/test integration

@tnozicka
Copy link
Contributor Author

/test extended_conformance_install

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 18233, 18068, 18228, 18227).

@openshift-merge-robot openshift-merge-robot merged commit 042a63f into openshift:master Jan 23, 2018
@openshift-cherrypick-robot

@tnozicka: cannot checkout release-3.8
: error checking out release-3.8
: exit status 1. output: error: pathspec 'release-3.8?' did not match any file(s) known to git.

In response to this:

/cherrypick release-3.8
(let's see if it works first)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link

@tnozicka: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install 6f1df56 link /test extended_conformance_install

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-merge-robot added a commit that referenced this pull request Jan 24, 2018
…7-release-3.7

Automatic merge from submit-queue.

[3.7] UPSTREAM: 58572: Automated cherry pick of #58547: Send correct resource version for delete events from watch

Backport of #18233 via kubernetes/kubernetes#58572

/assign @liggitt
@tnozicka tnozicka deleted the backport-watch-cache-fix-58547 branch January 24, 2018 21:25
openshift-merge-robot added a commit that referenced this pull request Jan 30, 2018
…7-release-3.8

Automatic merge from submit-queue.

[3.8] UPSTREAM: 58571: Automated cherry pick of #58547: Send correct resource version for delete events from watch

Backport of #18233 via kubernetes/kubernetes#58571

/assign @liggitt
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Jan 30, 2018
…e-fix-58547-release-3.8

Automatic merge from submit-queue.

[3.8] UPSTREAM: 58571: Automated cherry pick of kubernetes#58547: Send correct resource version for delete events from watch

Backport of openshift/origin#18233 via kubernetes#58571

/assign @liggitt

Origin-commit: 360fac5be27896518ad01b63a0ea132174af23e8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. priority/P0 queue/critical-fix size/L Denotes a PR that changes 100-499 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deploymentconfigs when run iteratively [Conformance] should only deploy the last deployment
5 participants