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

Automated cherry pick of #40497 #40498

Conversation

lavalamp
Copy link
Member

Cherry pick of #40497 on release-1.5.

#40497: Make HandleError prevent hot-loops

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 26, 2017
Add an error "handler" that just sleeps for a bit if errors happen more
often than 500ms. Manually tested against kubernetes#39816.
@lavalamp lavalamp force-pushed the automated-cherry-pick-of-#40497-upstream-release-1.5 branch from c511f76 to 9fc7413 Compare January 26, 2017 00:19
@k8s-github-robot k8s-github-robot added this to the v1.5 milestone Jan 26, 2017
@k8s-github-robot k8s-github-robot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 26, 2017
@k8s-github-robot
Copy link

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

We suggest the following people:
cc @thockin
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@lavalamp lavalamp assigned saad-ali and unassigned brendandburns Jan 26, 2017
@saad-ali
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 26, 2017
@thockin thockin added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2017
@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

@k8s-github-robot k8s-github-robot merged commit 0bd0b54 into kubernetes:release-1.5 Jan 26, 2017
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", 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.

None yet

7 participants