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

Bugfix: Cronjob ctx cancel #731

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Bugfix: Cronjob ctx cancel #731

merged 1 commit into from
Feb 22, 2022

Conversation

jklaw90
Copy link
Contributor

@jklaw90 jklaw90 commented Feb 18, 2022

Removed the stop channel and just use ctx.
Fixes #728

@k8s-ci-robot
Copy link
Contributor

Hi @jklaw90. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 18, 2022
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 18, 2022
ingvagabund
ingvagabund reviewed Feb 22, 2022
View reviewed changes
Copy link
Contributor

@ingvagabund ingvagabund left a comment

Choose a reason for hiding this comment

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

Looks good!!! Left one nit

cmd/descheduler/app/server.go
if err != nil {
klog.ErrorS(err, "descheduler server")
}

done()
Copy link
Contributor

Choose a reason for hiding this comment

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

Would moving done back under the defer produce the same behavior?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed it this way to notify the metrics server to close which blocks on the next line until all requests are done. If I kept it as a defer it's going to hang forever on the blocking channel for the cronjob case.

Copy link
Contributor

Choose a reason for hiding this comment

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

Understood.

pkg/descheduler/descheduler.go
@@ -69,13 +69,7 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
return err
}

// tie in root ctx with our wait stopChannel
stopChannel := make(chan struct{})
Copy link
Contributor

Choose a reason for hiding this comment

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

I like removing this part!!!

@ingvagabund
Copy link
Contributor

/ok-to-test
/approve

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 22, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund, jklaw90

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 Feb 22, 2022
@damemi damemi mentioned this pull request Feb 22, 2022
Closed
@ingvagabund
Copy link
Contributor

There's a valid building error in the e2e:

vet: test/e2e/e2e_test.go:989:105: too many arguments in call to descheduler.RunDeschedulerStrategies

@ingvagabund
Copy link
Contributor

@jklaw90 would you mind squashing the commits? Looks good.

@ingvagabund
Copy link
Contributor

/retest

@ingvagabund
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2022
@jklaw90
Copy link
Contributor Author

jklaw90 commented Feb 22, 2022

/retest

@k8s-ci-robot k8s-ci-robot merged commit 54c50c5 into kubernetes-sigs:master Feb 22, 2022
@JaneLiuL JaneLiuL mentioned this pull request Feb 25, 2022
Closed
This was referenced Feb 25, 2022
Closed
Merged
@damemi damemi mentioned this pull request Mar 21, 2022
Closed
@a7i a7i mentioned this pull request Nov 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ingvagabund ingvagabund ingvagabund left review comments

@damemi damemi Awaiting requested review from damemi

@k82cn k82cn Awaiting requested review from k82cn

Assignees

@ingvagabund ingvagabund

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Panic with K8s v1.22: Close of closed channel
3 participants
@jklaw90 @k8s-ci-robot @ingvagabund