This repository was archived by the owner on Sep 30, 2024. It is now read-only.
fix/internal/memcmd: close the explicit stop channel before cancelling context#63214
Merged
ggilmore merged 1 commit intoJun 12, 2024
Conversation
Contributor
Author
This stack of pull requests is managed by Graphite. Learn more about stacking. |
eseliger
approved these changes
Jun 12, 2024
|
|
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR tweaks the logic in the linux memory observer that skips over context cancellation errors that occur when we deliberately stop the observer.
https://github.com/sourcegraph/sourcegraph/blob/553b5c55ac60986a3b8d3a1a0ba8b3118f94731b/internal/memcmd/observer_linux.go#L156-L172
Before it was possible for the above code to run after the context was cancelled, but before the explicitlyStopped channel was closed. This would cause the function to incorrectly keep the context cancellation error.
Now, we make sure to close the channel before canceling the context in Stop - thus fixing the above issue.
Test plan
Existing unit tests (you can't really test a race condition like this).
Changelog
This PR fixes a logspam bug in the linux memory observer that was due to do slightly faulty synchronizzation logic.