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.

Sign up for GitHub

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

Jump to bottom

Call getKubeletSandboxes first in containerGC#evictSandboxes #78368

Merged
merged 1 commit into from Jul 11, 2019
Merged

Call getKubeletSandboxes first in containerGC#evictSandboxes #78368

merged 1 commit into from Jul 11, 2019

Conversation

tedyu
Copy link
Contributor

@tedyu tedyu commented May 26, 2019

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
In containerGC#evictSandboxes, we use sandboxIDs to collect PodSandboxId's.
Later cgc.manager.getKubeletSandboxes is called which may return error.

This PR swaps the order of these two activities so that if cgc.manager.getKubeletSandboxes returns error, we don't collect PodSandboxId's.

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 26, 2019
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 26, 2019
@tedyu
Copy link
Contributor Author

tedyu commented May 26, 2019

/test pull-kubernetes-integration

mattjmcnaughton
mattjmcnaughton approved these changes May 27, 2019
View reviewed changes
Copy link
Contributor

@mattjmcnaughton mattjmcnaughton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Thanks for this change :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2019
@tedyu
Copy link
Contributor Author

tedyu commented May 28, 2019

@derekwaynecarr @vishh
Please review

@tedyu
Copy link
Contributor Author

tedyu commented Jul 11, 2019

@vishh
Please review.

@vishh
Copy link
Contributor

vishh commented Jul 11, 2019

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tedyu, vishh

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 11, 2019
@k8s-ci-robot k8s-ci-robot merged commit becf718 into kubernetes:master Jul 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattjmcnaughton mattjmcnaughton mattjmcnaughton approved these changes

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@mtaufen mtaufen Awaiting requested review from mtaufen

Assignees

@mattjmcnaughton mattjmcnaughton

@vishh vishh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tedyu @vishh @k8s-ci-robot @mattjmcnaughton