Skip to content
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.

Sign up for GitHub

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

[Geoip+ci] Fix flaky release check in ci #36118

Merged
merged 1 commit into from
Sep 13, 2024
Merged

[Geoip+ci] Fix flaky release check in ci #36118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/extensions/geoip_providers/maxmind/geoip_provider_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ class GeoipProviderTestBase {
Registry::FactoryRegistry<Geolocation::GeoipProviderFactory>::getFactory(
"envoy.geoip_providers.maxmind"));
ASSERT(provider_factory_);
on_changed_cbs_.reserve(1);
}

~GeoipProviderTestBase() {
Expand All @@ -116,6 +115,7 @@ class GeoipProviderTestBase {
Filesystem::Watcher::OnChangedCb cb) {
{
absl::WriterMutexLock lock(&mutex_);
on_changed_cbs_.reserve(1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the flake that we should only be accessing on_change_cbs_ with the mutex?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, the tests were failing nondeterministically in somewhat random code paths before this fix (in release ci check)

on_changed_cbs_.emplace_back(std::move(cb));
}
if (conditional.has_value()) {
Expand Down