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: 62572: Prevent virtual infinite loop in volume controller #19371

Merged
merged 1 commit into from
Apr 17, 2018

Conversation

joelsmith
Copy link
Contributor

What this PR does / why we need it:

In WatchPod(), if one of the two channels being watched (pod updates and events) is closed, the for/select loop turns into a tight infinite loop because the select immediately falls through due to the channel being closed. Watch them independently instead.

xref kubernetes/kubernetes#62572

Which issue(s) this PR fixes:

N/A, but see upstream issue kubernetes/kubernetes#62571

Special notes for your reviewer:

Fix potential infinite loop that can occur when NFS PVs are recycled.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 16, 2018
@joelsmith joelsmith added kind/bug Categorizes issue or PR as related to a bug. component/storage labels Apr 16, 2018
@joelsmith
Copy link
Contributor Author

@gnufied Here's the backport PR of the one you reviewed upstream over the weekend. PTAL.

Thanks!

@joelsmith joelsmith changed the title Prevent virtual infinite loop in volume controller UPSTREAM: 62572: Prevent virtual infinite loop in volume controller Apr 16, 2018
@gnufied
Copy link
Member

gnufied commented Apr 16, 2018

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied, joelsmith

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2018
@openshift-merge-robot openshift-merge-robot merged commit 8ec30c7 into openshift:master Apr 17, 2018
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. component/storage kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. 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.

4 participants