xds: enable race detector and some small cleanup #9461
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
github-actions
bot
added
the
type/ci
|
TODO: remove the last commit about extracting an authorize function, and move that to a new PR. We may not have any tests of the ACL tokens, so add one in the new PR. Edit: moved to #9529 |
small cleanup in tests
TestEnvoy.Close used e.stream.recvCh == nil to indicate the channel had already been closed, so that TestEnvoy.Close can be called multiple times. The recvCh was not protected by a lock, so setting it to nil caused a data race with any goroutine trying to read from the channel. Instead set the stream to nil. The stream is guarded by a lock, so it does not race. This change allows us to test the agent/xds package using -race.
Requiring a call to initialize to set a single field is not really substantially different from having to set that field to a value.
dnephin
force-pushed
the
dnephin/xds-server
branch
from
9181a05 to
a04cefa
Compare
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/306904. |
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/306933. |
|
🍒✅ Cherry pick of commit 6f996ad onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Jan 7, 2021
xds: enable race detector and some small cleanup
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.
One commit related to #8329
Mostly some minor cosmetic cleanup as I was reading over this code again. Also fixed what seems to be the only data race in the
agent/xdspackage, which allows us to run the tests withgo test -race.Best viewed by individual commit.