-
Notifications
You must be signed in to change notification settings - Fork 40
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
Fixes race in detection of ClickHouse port from log file #139
Merged
Conversation
This file contains 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
The original implementation of this code searched the ClickHouse log file for the port number, but only until EOF. There's a race here, as the ClickHouse subprocess may not write the port number by the time the reading code starts parsing the log -- the reader hits EOF before the port is written, and bails. This commit adds a loop for reading the log file that ignores EOF, sleeping for a time. This is run with a timeout to avoid an infinite loop. Regression tests have also been added.
This should close #130 |
smklein
reviewed
Jun 29, 2021
smklein
approved these changes
Jun 29, 2021
Uses `tokio`'s utilities for pausing and advancing time explicitly to run the tests for parsing ClickHouse's log file for a port number. These can be used to avoid long sleeps, as we can directly advance time "beyond" those points, by an amount appropriate for the test
@smklein @andrewjstone New commit up that advances time explicitly to avoid "real" sleeps. Thanks Sean for the tip, let me know if y'all have other thoughts! |
smklein
reviewed
Jun 29, 2021
smklein
reviewed
Jun 29, 2021
smklein
approved these changes
Jun 30, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL about cargo's resolver versions.
LGTM!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The original implementation of this code searched the ClickHouse log
file for the port number, but only until EOF. There's a race here, as
the ClickHouse subprocess may not write the port number by the time the
reading code starts parsing the log -- the reader hits EOF before the
port is written, and bails.
This commit adds a loop for reading the log file that ignores EOF,
sleeping for a time. This is run with a timeout to avoid an infinite
loop. Regression tests have also been added.