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.

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

On demand loading of ScopedRouteConfiguration #12640

Merged
merged 62 commits into from
Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ef08270
merge
Aug 7, 2020
c3d39db
add test and test migration to v3
Aug 10, 2020
7f93c95
add test and test migration to v3
Aug 10, 2020
88704aa
add unit test
Aug 10, 2020
71d9526
add unit test for dangling reference
Aug 11, 2020
1fb167f
add unit test for dangling reference
Aug 11, 2020
3cb0a1c
clean up
Aug 11, 2020
399ad9b
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Aug 11, 2020
2e5eccc
clean up
Aug 11, 2020
477dc6b
clean up
Aug 11, 2020
abd354b
test migration
Aug 12, 2020
25f487d
...
Aug 12, 2020
ab60437
finish
Aug 13, 2020
ae188bf
Merge branch 'master' of https://github.com/envoyproxy/envoy into tes…
Aug 13, 2020
7353474
clean up
Aug 13, 2020
3ce3677
make control flag bool
Aug 13, 2020
d54fc36
fix spelling
Aug 14, 2020
6588bf2
fix spelling
Aug 14, 2020
6cca147
clean up
Aug 14, 2020
f05c622
clean up
Aug 14, 2020
9626719
clean up
Aug 14, 2020
3f23c10
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Aug 15, 2020
b2e3e1f
change scope interface
Aug 15, 2020
2564425
...
Aug 15, 2020
7c4d74d
unit test for srds stats
Aug 17, 2020
8a641f2
refactor
Aug 17, 2020
c65f4b7
add comment
Aug 20, 2020
1aeb72b
sync
Aug 20, 2020
f941ea4
fix format
Aug 20, 2020
74f8c29
add comments
Aug 22, 2020
346ff81
fix spelling
Aug 22, 2020
a4153af
fix test
Aug 25, 2020
16aa77e
release note
Aug 25, 2020
44d5c29
release note
Aug 25, 2020
3dcfa02
release note
Aug 25, 2020
041bc98
release note
Aug 25, 2020
874e4d3
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Aug 25, 2020
67734d8
fix format
Aug 25, 2020
eddcd6d
add comment
Aug 26, 2020
8f40eb2
fix nullconfig comparasion
Aug 27, 2020
45e633c
clean up
Aug 27, 2020
d56f1bc
refactor
Aug 27, 2020
e08c201
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Aug 27, 2020
b9dc81f
pass scope key
Aug 27, 2020
71b7a1b
format
Aug 27, 2020
e4e7a51
add test
Aug 28, 2020
d9affce
clean up
Aug 31, 2020
896f52a
add test
Sep 1, 2020
826ef9d
test
Sep 2, 2020
e1e1e74
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Sep 2, 2020
44cb868
clean up
Sep 2, 2020
d8c3552
resolve conflict
Sep 2, 2020
62cb93f
less verbose
Sep 7, 2020
6d3f7f0
less verbose
Sep 7, 2020
d26f173
clean up
Sep 7, 2020
6a46ebb
clean up
Sep 7, 2020
d78d733
Merge branch 'master' of https://github.com/envoyproxy/envoy into laz…
Sep 7, 2020
70ec602
clean up
Sep 7, 2020
d60da44
clean up
Sep 7, 2020
ae7f157
fix missing test coverage
Sep 8, 2020
1da611e
add comment
Sep 8, 2020
f867e53
add comment
Sep 8, 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
8 changes: 3 additions & 5 deletions source/common/http/conn_manager_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,9 @@ void ConnectionManagerImpl::RdsRouteConfigUpdateRequester::requestVhdsUpdate(
void ConnectionManagerImpl::RdsRouteConfigUpdateRequester::requestSrdsUpdate(
Router::ScopeKeyPtr scope_key, Event::Dispatcher& thread_local_dispatcher,
Http::RouteConfigUpdatedCallbackSharedPtr route_config_updated_cb) {
// If it is inline scope_route_config_provider, will be cast to nullptr.
if (scoped_route_config_provider_ == nullptr) {
(*route_config_updated_cb)(false);
return;
}
// since inline scope_route_config_provider is not fully implemented and never used,
chaoqin-li1123 marked this conversation as resolved.
Show resolved Hide resolved
// dynamic cast in constructor always succeed and the pointer should not be null here.
ASSERT(scoped_route_config_provider_ != nullptr);
Http::RouteConfigUpdatedCallback scoped_route_config_updated_cb =
Http::RouteConfigUpdatedCallback(
[this, weak_route_config_updated_cb = std::weak_ptr<Http::RouteConfigUpdatedCallback>(
Expand Down
6 changes: 4 additions & 2 deletions source/common/http/conn_manager_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,

RdsRouteConfigUpdateRequester(Config::ConfigProvider* scoped_route_config_provider,
ActiveStream& parent)
// Only on demand update for ScopeRdsConfigProvider is supported.
// InlineScopedRoutesConfigProvider will cast to nullptr in this ctor.
// Expect the dynamic cast to succeed because only ScopedRdsConfigProvider is fully
// implemented. Inline provider will be cast to nullptr here but it is not full implemented
// and can't not be used at this point. Should change this implementation if we have a
// functional inline scope route provider in the future.
: scoped_route_config_provider_(
dynamic_cast<Router::ScopedRdsConfigProvider*>(scoped_route_config_provider)),
parent_(parent) {}
Expand Down