Skip to content

fix(actionqueue): guard cancel nil in StopCleanup #2687

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

Open
directionless wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(actionqueue): guard cancel nil in StopCleanup #2687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ee/control/actionqueue/actionqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ func (aq *ActionQueue) runCleanup() {
}

func (aq *ActionQueue) StopCleanup(err error) {
aq.cancel()
if aq.cancel != nil {
aq.cancel()
}
}
Comment on lines +178 to 181

@RebeccaMahany RebeccaMahany Apr 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We probably also want a lock around aq.cancel to avoid flaky data race failures in tests?

@directionless directionless Apr 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It passed CI, do you still think we need it?

@RebeccaMahany RebeccaMahany Apr 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yes, might as well if we're updating this area anyway


func (aq *ActionQueue) storeActionRecord(actionToStore action) {
Expand Down
Loading