-
Notifications
You must be signed in to change notification settings - Fork 871
Fix records_yaml startup lookup race #13538
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
Open
bneradt
wants to merge
2
commits into
apache:master
Choose a base branch
from
bneradt:fix-records-yaml-flake
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+56
−9
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,11 +17,16 @@ | |
| or implied. See the License for the specific language governing permissions and limitations under | ||
| the License. | ||
| */ | ||
| #include <atomic> | ||
| #include <string> | ||
| #include <thread> | ||
|
|
||
| #include <catch2/catch_test_macros.hpp> | ||
| #include "records/RecCore.h" | ||
| #include "iocore/eventsystem/EventSystem.h" | ||
| #include "iocore/eventsystem/RecProcess.h" | ||
| #include "tscore/Layout.h" | ||
| #include "tsutil/Metrics.h" | ||
| #include "test_Diags.h" | ||
|
|
||
| TEST_CASE("RecRegisterConfig - Type Dispatch", "[librecords][RecConfig]") | ||
|
|
@@ -87,3 +92,43 @@ TEST_CASE("RecRegisterStat - Type Dispatch", "[librecords][RecStat]") | |
| REQUIRE(value == 500); | ||
| } | ||
| } | ||
|
|
||
| TEST_CASE("RecLookupRecord - Concurrent metric registration", "[librecords][RecLookup]") | ||
| { | ||
| constexpr char record_name[] = "proxy.test.concurrent.string_value"; | ||
| constexpr char record_value[] = "stable"; | ||
|
|
||
| REQUIRE(RecRegisterConfigString(RECT_CONFIG, record_name, record_value, RECU_DYNAMIC, RECC_NULL, nullptr, REC_SOURCE_NULL) == | ||
| REC_ERR_OKAY); | ||
|
|
||
| std::atomic<bool> start{false}; | ||
| std::atomic<bool> finished{false}; | ||
| std::thread register_metrics([&]() { | ||
| while (!start.load(std::memory_order_acquire)) { | ||
| std::this_thread::yield(); | ||
| } | ||
|
|
||
| for (int i = 0; i < 100000; ++i) { | ||
| auto metric_name = std::string{"proxy.process.test.concurrent_metric_registration."} + std::to_string(i); | ||
|
|
||
| ts::Metrics::Counter::create(metric_name); | ||
| } | ||
| finished.store(true, std::memory_order_release); | ||
| }); | ||
|
|
||
| bool all_lookups_succeeded = true; | ||
| size_t lookup_count = 0; | ||
|
|
||
| start.store(true, std::memory_order_release); | ||
| while (!finished.load(std::memory_order_acquire)) { | ||
| if (RecGetRecordStringAlloc(record_name) != record_value) { | ||
| all_lookups_succeeded = false; | ||
| break; | ||
| } | ||
| ++lookup_count; | ||
| } | ||
|
Comment on lines
+123
to
+129
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This loop can run 0 times in theory, which will fail the test. What was the intent here? |
||
| register_metrics.join(); | ||
|
|
||
| CHECK(lookup_count > 0); | ||
| CHECK(all_lookups_succeeded); | ||
| } | ||
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.
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.
Nit: it's better to include standard headers after local project headers to expose missing includes quickly.