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

GC should retry on patch error #47000

Merged
merged 1 commit into from
Jun 13, 2017

Conversation

caesarxuchao
Copy link
Member

Fixing #46998.

This is fixing a bug, so applying the 1.7 milestone.

@caesarxuchao caesarxuchao added the kind/bug Categorizes issue or PR as related to a bug. label Jun 5, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 5, 2017
@caesarxuchao caesarxuchao added this to the v1.7 milestone Jun 5, 2017
@lavalamp
Copy link
Member

lavalamp commented Jun 5, 2017

test? also I think the milestone goes on the issue.

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Jun 5, 2017
@caesarxuchao caesarxuchao force-pushed the fix-gc-orphan branch 2 times, most recently from b164858 to 8bc4343 Compare June 6, 2017 00:21
@caesarxuchao
Copy link
Member Author

Added a unit test. @lavalamp PTAL. Thanks.

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 6, 2017
@caesarxuchao
Copy link
Member Author

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jun 6, 2017
@caesarxuchao
Copy link
Member Author

@k8s-bot pull-kubernetes-e2e-gce-etcd3 test this

@0xmichalis
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 7, 2017
@marun marun added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Jun 8, 2017
@lavalamp
Copy link
Member

It is not clear to me why this change causes a retry--I was hoping the test would demonstrate the retry behavior but I am still confused :)

@0xmichalis
Copy link
Contributor

It is not clear to me why this change causes a retry--I was hoping the test would demonstrate the retry behavior but I am still confused :)

attemptToOrphanWorker adds the item back in the queue if orphanDependents returns an error.

@caesarxuchao
Copy link
Member Author

+1 on what @Kargakis said

Regarding the test, it will be complicated to write a unit test to verify the queue status since we don't have a fake queue, so i just wrote the unit test to verify a proper error is returned by orphanDependents.

@0xmichalis
Copy link
Contributor

0xmichalis commented Jun 12, 2017

Regarding the test, it will be complicated to write a unit test to verify the queue status since we don't have a fake queue, so i just wrote the unit test to verify a proper error is returned by orphanDependents.

FWIW, I wrote a similar test a while back for Recreate deployments: e2695d9 (check TestPodDeletionEnqueuesRecreateDeployment).

@caesarxuchao
Copy link
Member Author

@k8s-bot pull-kubernetes-e2e-kops-aws test this

@lavalamp
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, kargakis, lavalamp

Associated issue: 46998

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

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2017
@caesarxuchao
Copy link
Member Author

/retest

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 47000, 47188, 47094, 47323, 47124)

@k8s-github-robot k8s-github-robot merged commit 3b05e19 into kubernetes:master Jun 13, 2017
@k8s-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-etcd3 a0a2e95 link @k8s-bot pull-kubernetes-e2e-gce-etcd3 test this

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.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants