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

Increase request timeout based on termination grace period #31275

Merged
merged 1 commit into from
Aug 25, 2016

Conversation

dims
Copy link
Member

@dims dims commented Aug 23, 2016

When terminationGracePeriodSeconds is set to > 2 minutes (which is
the default request timeout), ContainerStop() times out at 2 minutes.
We should check the timeout being passed in and bump up the
request timeout if needed.

Fixes #31219


This change is Reviewable

When terminationGracePeriodSeconds is set to > 2 minutes (which is
the default request timeout), ContainerStop() times out at 2 minutes.
We should check the timeout being passed in and bump up the
request timeout if needed.

Fixes kubernetes#31219
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Aug 23, 2016
@Random-Liu
Copy link
Member

LGTM.

@Random-Liu Random-Liu added this to the v1.4 milestone Aug 23, 2016
@Random-Liu
Copy link
Member

Mark 1.4, because this fixes a bug #31219.

@Random-Liu Random-Liu added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 23, 2016
@dchen1107
Copy link
Member

LGTM Thanks for taking care this bug.

@dchen1107 dchen1107 added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 23, 2016
@Random-Liu
Copy link
Member

@k8s-bot test this issue #31262.

@Random-Liu Random-Liu self-assigned this Aug 23, 2016
@Random-Liu Random-Liu added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 23, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 23, 2016

GCE e2e build/test passed for commit 87a370f.

k8s-github-robot pushed a commit that referenced this pull request Aug 24, 2016
…pstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of #31275

Cherry pick of #31275 on release-1.3.
@yujuhong
Copy link
Contributor

Uh...we cherry-picked the PR to v1.3 before merging it in the master branch :\

@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Aug 25, 2016

GCE e2e build/test passed for commit 87a370f.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit e4178c8 into kubernetes:master Aug 25, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…f-#31275-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#31275

Cherry pick of kubernetes#31275 on release-1.3.
@dims dims deleted the fix-issue-31219 branch November 16, 2017 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants