Last updated config dump #3691
Merged
Last updated config dump #3691
Conversation
This file contains 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
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
Signed-off-by: James Buckland <jbuckland@google.com>
…igDump Signed-off-by: James Buckland <jbuckland@google.com>
htuch
suggested changes
Jun 21, 2018
source/common/router/rds_impl.cc
Outdated
| } | ||
| } | ||
|
|
||
| for (const auto& provider : getStaticRouteConfigProviders()) { | ||
| ASSERT(provider->configInfo()); | ||
| config_dump->mutable_static_route_configs()->Add()->MergeFrom( | ||
| provider->configInfo().value().config_); | ||
|
|
| admin.getConfigTracker().add("clusters", [this] { return dumpClusterConfigs(); })) { | ||
| admin.getConfigTracker().add("clusters", [this] { return dumpClusterConfigs(); })), | ||
| system_time_source_(system_time_source) { | ||
|
|
| std::make_unique<ClusterData>(cluster, version_info, added_via_api, std::move(new_cluster)); | ||
| cluster_map[cluster_reference.info()->name()] = std::make_unique<ClusterData>( | ||
| cluster, version_info, added_via_api, std::move(new_cluster), system_time_source_); | ||
|
|
| config_tracker_entry_(server.admin().getConfigTracker().add( | ||
| "listeners", [this] { return dumpListenerConfigs(); })) { | ||
|
|
| @@ -306,6 +331,12 @@ TEST_P(AdsIntegrationTest, Basic) { | |||
| compareDiscoveryRequest(Config::TypeUrl::get().RouteConfiguration, "2", {"route_config_0"})); | |||
|
|
|||
| makeSingleRequest(); | |||
| ProtobufWkt::Timestamp first_active_listener_ts_2 = | |||
Signed-off-by: James Buckland <jbuckland@google.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Title: Add last_updated timestamp field to all XDSConfigDump protos.
Description:
This adds a new google.protobuf.Timestamp last_updated field to BootstrapConfigDump, ListenersConfigDump, ClustersConfigDump, and RoutesConfigDump, representing the time when the configs under that category were last updated.
Additionally, the ProdSystemTimeSource::instance_ singleton is passed through several layers of interfaces. This is to make testing easier, but I would love to find a workaround for injecting a MockSystemTimeSource closer to the point where it is needed in the tests.
Risk Level: Low
Testing:
Several tests were modified / updated to compare the dumped time (always 1234567890 seconds since epoch time) by using a MockSystemTimeSource which always returned 1234567890.
Recreated PR based off #3641.