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.

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

Do not make additional control server fetch request during control server interval update #1675

Merged
merged 7 commits into from
Apr 10, 2024

Conversation

RebeccaMahany
Copy link
Contributor

@RebeccaMahany RebeccaMahany commented Apr 9, 2024

Because we are already inside a Fetch call, the fetchMutex is locked -- so, currently, whenever the control request interval updates we deadlock forever and launcher will not make a request to the control server until it is restarted.

This PR removes the possibility for deadlock during the extra Fetch call. I also made a couple small adjustments to prevent data races in the new test.

@RebeccaMahany RebeccaMahany marked this pull request as ready for review April 9, 2024 18:07
James-Pickett
James-Pickett previously approved these changes Apr 9, 2024
zackattack01
zackattack01 previously approved these changes Apr 9, 2024
Copy link
Contributor

@zackattack01 zackattack01 left a comment

Choose a reason for hiding this comment

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

great find 🔥

Copy link
Contributor

@directionless directionless left a comment

Choose a reason for hiding this comment

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

I think this is fine

@RebeccaMahany RebeccaMahany added this pull request to the merge queue Apr 10, 2024
Merged via the queue into kolide:main with commit 341cbcd Apr 10, 2024
31 checks passed
@RebeccaMahany RebeccaMahany deleted the becca/no-fetch-during-fetch branch April 10, 2024 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants