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

jobs: Ensure schedules are cancelled when scheduler disabled. #77306

Merged
merged 1 commit into from
Mar 3, 2022
Merged

jobs: Ensure schedules are cancelled when scheduler disabled. #77306

merged 1 commit into from
Mar 3, 2022

Conversation

miretskiy
Copy link
Contributor

Ensure that currently executing schedules are cancelled immediately
when jobs scheduler disabled via the jobs.scheduler.enabled setting.

Fixes #77248

Release Note (enterprise change): Currently executing schedules are
cancelled immediately when jobs scheduler disabled.

Release Justification: stability improvement.

@miretskiy miretskiy requested review from dt and ajwerner March 2, 2022 20:55
@miretskiy miretskiy requested review from a team as code owners March 2, 2022 20:55
@miretskiy miretskiy requested review from otan and removed request for a team March 2, 2022 20:55
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@miretskiy miretskiy force-pushed the disable_scheduler branch from dc1e43d to ec0079f Compare March 2, 2022 20:57
dt
dt reviewed Mar 2, 2022
View reviewed changes
pkg/jobs/job_scheduler.go Outdated
type syncCancelFunc struct {
syncutil.Mutex
context.CancelFunc
sv *settings.Values
Copy link
Member

Choose a reason for hiding this comment

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

do we need to capture sv? don't we have it at the withCancelOnDisabled callsite too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah; we could pass it in...done.

@miretskiy miretskiy force-pushed the disable_scheduler branch from ec0079f to fa13954 Compare March 2, 2022 21:11
jobs: Ensure schedules are cancelled when scheduler disabled.
3661ab1 
Ensure that currently executing schedules are cancelled immediately
when jobs scheduler disabled via the `jobs.scheduler.enabled` setting.

Fixes cockroachdb#77248

Release Note (enterprise change): Currently executing schedules are
cancelled immediately when jobs scheduler disabled.

Release Justification: stability improvement.
@miretskiy miretskiy force-pushed the disable_scheduler branch from fa13954 to 3661ab1 Compare March 2, 2022 21:12
@miretskiy
Copy link
Contributor Author

Informs #70920

@miretskiy
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 3, 2022

Build succeeded:

@craig craig bot merged commit 1e1d559 into cockroachdb:master Mar 3, 2022
@blathers-crl
Copy link

blathers-crl bot commented Mar 3, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating backport branch refs/heads/blathers/backport-release-21.1-77306: POST https://api.github.com/repos/cockroachlabs/cockroach/git/refs: 403 Resource not accessible by integration []

Backport to branch 21.1.x failed. See errors above.

error creating backport branch refs/heads/blathers/backport-release-21.2-77306: POST https://api.github.com/repos/cockroachlabs/cockroach/git/refs: 403 Resource not accessible by integration []

Backport to branch 21.2.x failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

@cockroach-teamcity cockroach-teamcity mentioned this pull request Mar 3, 2022
Closed
This was referenced Mar 3, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dt dt dt approved these changes

@ajwerner ajwerner Awaiting requested review from ajwerner

@otan otan Awaiting requested review from otan otan was automatically assigned from cockroachdb/test-eng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

jobs: Changes to jobs.scheduler.enabled must be respected immediately.
3 participants
@miretskiy @cockroach-teamcity @dt