WIP server: resolve tsan failure due to main_common refactor#2616
Closed
jmarantz wants to merge 4 commits intoenvoyproxy:masterfrom
Closed
WIP server: resolve tsan failure due to main_common refactor#2616jmarantz wants to merge 4 commits intoenvoyproxy:masterfrom
jmarantz wants to merge 4 commits intoenvoyproxy:masterfrom
Conversation
Provide support to allow folks to use thread annotations across Envoy in the absence of a full solution to envoyproxy#2571. Signed-off-by: Harvey Tuch <htuch@google.com>
When using --runs_per_test with concurrency the individual invocations of the hot restart test may collide. Bazel provides an environment variable when using --runs_per_test that allows us to set --base_id in each parallel invocation to a guaranteed unique value so this doesn't happen. Signed-off-by: Dan Noé <dpn@google.com>
Envoy sets up SHM even when not starting up fully, so even cases where the binary is not started with a full config want --base-id. Otherwise we can get "file exists" when running many tests in parallel. Signed-off-by: Dan Noé <dpn@google.com>
…h a lock that persists through run(). Signed-off-by: Joshua Marantz <jmarantz@google.com>
Member
|
Need to resolve merge conflicts |
Contributor
Author
|
Dropping this in favor of #2623 |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Description:
Replace the call to
Logger::Registry::initialize(options_.logLevel(), log_lock);which had been removed in the earlier refactor, and resulted in the logger being functional but not thread-safe, hence tsan errors.Note that this incorporates #2609 to allow parallel testing of test/integration:hotrestart_test.
Also note that this branch incorporates #2568 but not the rollback of it in #2613 so it can't be merged as is, but it's probably easier to review this way.
Risk Level: Medium
Testing:
bazel test --compilation_mode=dbg --config=tsan test/integration:hotrestart_test --runs_per_test=100
Release Notes: n/a