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

apiserver: add lifecycle signal for preshutdown hook #110096

Merged
merged 1 commit into from May 18, 2022
Merged

apiserver: add lifecycle signal for preshutdown hook #110096

merged 1 commit into from May 18, 2022

Conversation

tkashem
Copy link
Contributor

@tkashem tkashem commented May 17, 2022 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Ref #108483

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 17, 2022
@tkashem
Copy link
Contributor Author

tkashem commented May 17, 2022

/assign @wojtek-t @aojea @p0lyn0mial @sttts

@k8s-ci-robot k8s-ci-robot requested review from apelisse and enj May 17, 2022 16:31
@k8s-ci-robot k8s-ci-robot added area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 17, 2022
@tkashem tkashem mentioned this pull request May 17, 2022
Merged
@tkashem
Copy link
Contributor Author

tkashem commented May 17, 2022

ref: #110026

wojtek-t
wojtek-t reviewed May 17, 2022
View reviewed changes
Copy link
Member

@wojtek-t wojtek-t left a comment

Choose a reason for hiding this comment

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

Just one small nit.

staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go Outdated
@@ -429,7 +429,7 @@ func (s *GenericAPIServer) PrepareRun() preparedGenericAPIServer {
// | |
// ShutdownInitiated (shutdownInitiatedCh) |
// | |
// (ShutdownDelayDuration) (PreShutdownHooks)
// (ShutdownDelayDuration) (PreShutdownHooksStopped)
Copy link
Member

Choose a reason for hiding this comment

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

The convention I was using was basically that inside () I was marking something that is happening.

The signals themselves are marked without () (and if there is something in() after the signal, it's in alias in the code.

So I think you need to:

  • leave this line as it was (basically signalling that preshutdown hooks are running at this point)
  • switch line 424 to:
    PreShutdownHooksStopped (preShutdownHooksHasStoppedCh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@roycaihw
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 17, 2022
@tkashem tkashem force-pushed the graceful-new-signal branch 2 times, most recently from 9b1c727 to f5f14e2 Compare May 17, 2022 21:23
aojea
aojea reviewed May 17, 2022
View reviewed changes
staging/src/k8s.io/apiserver/pkg/server/lifecycle_signals.go
@@ -143,6 +147,7 @@ func newLifecycleSignals() lifecycleSignals {
return lifecycleSignals{
ShutdownInitiated: newNamedChannelWrapper("ShutdownInitiated"),
AfterShutdownDelayDuration: newNamedChannelWrapper("AfterShutdownDelayDuration"),
PreShutdownHooksStopped: newNamedChannelWrapper("PreShutdownHooksStopped"),
Copy link
Member

Choose a reason for hiding this comment

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

don't we have a test that should fail now?

kubernetes/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_graceful_termination_test.go

Lines 227 to 232 in f727b5a

lifecycleSignalOrderExpected := []string{
string("ShutdownInitiated"),
string("AfterShutdownDelayDuration"),
string("HTTPServerStoppedListening"),
string("InFlightRequestsDrained"),
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, i am not wrapping PreShutdownHooksStopped in the test yet, preshutdown hook is still buggy, #110026 fixes the bug and the test wraps the hook as well.

@wojtek-t
Copy link
Member

/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 May 18, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tkashem, wojtek-t

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 May 18, 2022
@k8s-ci-robot k8s-ci-robot merged commit b1aa1bd into kubernetes:master May 18, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 18, 2022
@vpnachev vpnachev mentioned this pull request Dec 8, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aojea aojea aojea left review comments

@wojtek-t wojtek-t wojtek-t left review comments

@apelisse apelisse Awaiting requested review from apelisse

@enj enj Awaiting requested review from enj

Assignees

@sttts sttts

@aojea aojea

@wojtek-t wojtek-t

@p0lyn0mial p0lyn0mial

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@tkashem @roycaihw @wojtek-t @k8s-ci-robot @aojea @sttts @p0lyn0mial