Skip to content

xds: keep a reference to old config in the filter config provider #12479

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

Merged
mattklein123 merged 6 commits into from
Aug 6, 2020
Merged

xds: keep a reference to old config in the filter config provider #12479

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d2bf83
xds: keep a reference to old config till the end
kyessenov Aug 4, 2020
0e59997
fix test
kyessenov Aug 5, 2020
a9ba85e
try a different way
kyessenov Aug 5, 2020
e482369
fix initialization
kyessenov Aug 5, 2020
8d67825
format
kyessenov Aug 5, 2020
1387ebf
review
kyessenov Aug 5, 2020
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
21 changes: 12 additions & 9 deletions source/common/filter/http/filter_config_discovery_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,18 @@ void DynamicFilterConfigProviderImpl::validateConfig(
void DynamicFilterConfigProviderImpl::onConfigUpdate(Envoy::Http::FilterFactoryCb config,
const std::string&,
Config::ConfigAppliedCb cb) {
tls_->runOnAllThreads([config, cb](ThreadLocal::ThreadLocalObjectSharedPtr previous)
-> ThreadLocal::ThreadLocalObjectSharedPtr {
auto prev_config = std::dynamic_pointer_cast<ThreadLocalConfig>(previous);
prev_config->config_ = config;
if (cb) {
cb();
}
return previous;
});
auto old_config = this->config();
tls_->runOnAllThreads(
[config, cb](ThreadLocal::ThreadLocalObjectSharedPtr previous)
-> ThreadLocal::ThreadLocalObjectSharedPtr {
auto prev_config = std::dynamic_pointer_cast<ThreadLocalConfig>(previous);
prev_config->config_ = config;
if (cb) {
cb();
}
return previous;
},
[old_config]() {});

@mattklein123 mattklein123 Aug 5, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you add more comments in the final change?

}

FilterConfigSubscription::FilterConfigSubscription(
Expand Down