Skip to content

Fixing ECDS config dump flaky issue. #24362

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

Closed
yanjunxiang-google wants to merge 1 commit into from
Closed

Fixing ECDS config dump flaky issue. #24362

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
17 changes: 7 additions & 10 deletions source/common/filter/config_discovery_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,13 @@ class FilterConfigProviderManagerImplBase : Logger::Loggable<Logger::Id::filter>

private:
void setupEcdsConfigDumpCallbacks(OptRef<Server::Admin> admin) {
if (!admin.has_value()) {
return;
}
if (config_tracker_entry_ == nullptr) {
config_tracker_entry_ = admin->getConfigTracker().add(
getConfigDumpType(), [this](const Matchers::StringMatcher& name_matcher) {
return dumpEcdsFilterConfigs(name_matcher);
});
if (admin.has_value()) {
if (config_tracker_entry_ == nullptr) {
config_tracker_entry_ = admin->getConfigTracker().add(
getConfigDumpType(), [this](const Matchers::StringMatcher& name_matcher) {
return dumpEcdsFilterConfigs(name_matcher);
});
}
}
}

Expand All @@ -415,13 +414,11 @@ class FilterConfigProviderManagerImplBase : Logger::Loggable<Logger::Id::filter>
if (!ecds_filter || !name_matcher.match(ecds_filter->name())) {
continue;
}
// Put the filter info into a typed extension proto.
envoy::config::core::v3::TypedExtensionConfig filter_config;
filter_config.set_name(ecds_filter->name());
if (ecds_filter->lastConfig()) {
filter_config.mutable_typed_config()->PackFrom(*ecds_filter->lastConfig());
}
// Set up the config dump proto.
auto& filter_config_dump = *config_dump->mutable_ecds_filters()->Add();
filter_config_dump.mutable_ecds_filter()->PackFrom(filter_config);
filter_config_dump.set_version_info(ecds_filter->lastVersionInfo());
Expand Down