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

fix terminationGracePeriod blocked by preStop #115835

Merged
merged 2 commits into from
Jun 14, 2023
Merged

fix terminationGracePeriod blocked by preStop #115835

merged 2 commits into from
Jun 14, 2023

Conversation

HirazawaUi
Copy link
Contributor

@HirazawaUi HirazawaUi commented Feb 16, 2023 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

fix unreasonable hang caused by preStopHook after terminationGracePeriodSeconds, which is different from what is described in https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution

Which issue(s) this PR fixes:

Fixes #115817

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fixed the preStop hook will block the pod termination grace period

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 16, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @HirazawaUi. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 16, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 16, 2023
@SergeyKanzhelev
Copy link
Member

Please include some tests into this PR

@SergeyKanzhelev
Copy link
Member

/unassign @yujuhong

Let's ok to test once there are tests added to the PR

@SergeyKanzhelev
Copy link
Member

/priority important-longterm
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 17, 2023
@SergeyKanzhelev SergeyKanzhelev moved this from Triage to Waiting on Author in SIG Node PR Triage Feb 17, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 19, 2023
@SergeyKanzhelev SergeyKanzhelev moved this from Waiting on Author to Needs Reviewer in SIG Node PR Triage Mar 29, 2023
SataQiu
SataQiu reviewed Jun 2, 2023
View reviewed changes
pkg/kubelet/kuberuntime/kuberuntime_container_test.go Outdated
@@ -18,6 +18,7 @@ package kuberuntime

import (
"context"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
Copy link
Member

Choose a reason for hiding this comment

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

The package imports need to be grouped. So this change is unexpected.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I'll reset this file

SataQiu
SataQiu reviewed Jun 2, 2023
View reviewed changes
test/e2e_node/pod_termination_test.go Outdated
admissionapi "k8s.io/pod-security-admission/api"
)

var _ = SIGDescribe("Pod Termination", func() {
Copy link
Member

Choose a reason for hiding this comment

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

This looks more like part of the container-lifecycle tests, how about moving it into test/e2e_node/container_lifecycle_test.go?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This looks more like part of the container-lifecycle tests, how about moving it into test/e2e_node/container_lifecycle_test.go?

all right

@HirazawaUi HirazawaUi force-pushed the fix-terminationGracePeriod-bug branch from 2862471 to 1ed82ce Compare June 3, 2023 16:55
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 3, 2023
@HirazawaUi HirazawaUi force-pushed the fix-terminationGracePeriod-bug branch from 1ed82ce to f520f6f Compare June 3, 2023 17:12
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2023
@HirazawaUi
Copy link
Contributor Author

/retest

SataQiu
SataQiu reviewed Jun 4, 2023
View reviewed changes
Copy link
Member

@SataQiu SataQiu left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 23ae85e0fef65ac2f6024cb509777b8c26a2f0ac

@SataQiu SataQiu moved this from Needs Reviewer to Needs Approver in SIG Node PR Triage Jun 4, 2023
@SergeyKanzhelev SergeyKanzhelev moved this from PRs - Needs Reviewer to PRs - Needs Approver in SIG Node CI/Test Board Jun 7, 2023
SergeyKanzhelev
SergeyKanzhelev approved these changes Jun 14, 2023
View reviewed changes
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev left a comment

Choose a reason for hiding this comment

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

/lgtm

@SergeyKanzhelev SergeyKanzhelev moved this from PRs - Needs Approver to Done in SIG Node CI/Test Board Jun 14, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HirazawaUi, mrunalp, SataQiu, SergeyKanzhelev

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 Jun 14, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6a79a8a into kubernetes:master Jun 14, 2023
13 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Jun 14, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Jun 14, 2023
@Chaunceyctx Chaunceyctx mentioned this pull request Jul 8, 2023
Closed
This was referenced Dec 12, 2023
Closed
Closed
@liangjingtao11 liangjingtao11 mentioned this pull request Feb 21, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SataQiu SataQiu SataQiu left review comments

@gjkim42 gjkim42 gjkim42 left review comments

@mrunalp mrunalp mrunalp approved these changes

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev approved these changes

@bobbypage bobbypage Awaiting requested review from bobbypage

@yujuhong yujuhong Awaiting requested review from yujuhong

Assignees

@SataQiu SataQiu

@SergeyKanzhelev SergeyKanzhelev

@harche harche

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Done
SIG Node CI/Test Board
Archived in project
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

kubelet: PreStop Hooks can hang termination of a pod beyond pod's termination grace period
9 participants
@HirazawaUi @k8s-ci-robot @SergeyKanzhelev @yxxhero @gjkim42 @sanusatyadarshi @mrunalp @SataQiu @harche