-
Notifications
You must be signed in to change notification settings - Fork 391
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support pagination of output for instance config introspect
Limit the maximum number of entries displayed on a single page. A next_batch link is generated if there are more entries to display. Also limit maximum number of entries examined in one invocation of the callback routine. This comes into play when there is a search string specified and many entries don't match it. A partial page is saved in user-allocated data and the next invocation of callback appends to it. This is repeated till there's a full page or there are no more entries in the table. Following changes are implemented: - Add class template BgpShowHandler to facilitate code reuse - Move code from bgp_sandesh.cc to bgp_show_config.cc - Implement iteration limit to avoid hogging CPU from introspect - Reuse typed tests to also cover instance config - Fix a few typos in comments for typed tests Change-Id: I48389edd40fd099539210723690d6cbad317efa8 Closes-Bug: 1478154
- Loading branch information
Nischal Sheth
committed
Jul 27, 2015
1 parent
aec3c13
commit 48541a2
Showing
13 changed files
with
487 additions
and
123 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. | ||
| */ | ||
|
|
||
| #include "bgp/bgp_show_handler.h" | ||
|
|
||
| #include <boost/bind.hpp> | ||
| #include <boost/foreach.hpp> | ||
|
|
||
| #include "base/time_util.h" | ||
| #include "bgp/bgp_config.h" | ||
| #include "bgp/bgp_peer_internal_types.h" | ||
| #include "bgp/bgp_peer_types.h" | ||
| #include "bgp/bgp_server.h" | ||
|
|
||
| using std::string; | ||
| using std::vector; | ||
|
|
||
| // | ||
| // Fill in information for an instance. | ||
| // | ||
| static void FillBgpInstanceConfigInfo(ShowBgpInstanceConfig *sbic, | ||
| const BgpSandeshContext *bsc, const BgpInstanceConfig *instance) { | ||
| sbic->set_name(instance->name()); | ||
| sbic->set_virtual_network(instance->virtual_network()); | ||
| sbic->set_virtual_network_index(instance->virtual_network_index()); | ||
| sbic->set_vxlan_id(instance->vxlan_id()); | ||
|
|
||
| vector<string> import_list; | ||
| BOOST_FOREACH(std::string rt, instance->import_list()) { | ||
| import_list.push_back(rt); | ||
| } | ||
| sbic->set_import_target(import_list); | ||
| vector<string> export_list; | ||
| BOOST_FOREACH(std::string rt, instance->export_list()) { | ||
| export_list.push_back(rt); | ||
| } | ||
| sbic->set_export_target(export_list); | ||
| sbic->set_last_change_at(UTCUsecToString(instance->last_change_at())); | ||
|
|
||
| if (!instance->service_chain_list().empty()) { | ||
| const ServiceChainConfig &sci = instance->service_chain_list().front(); | ||
| ShowBgpServiceChainConfig sbscc; | ||
| sbscc.set_routing_instance(sci.routing_instance); | ||
| sbscc.set_service_instance(sci.service_instance); | ||
| sbscc.set_chain_address(sci.service_chain_address); | ||
| sbscc.set_prefixes(sci.prefix); | ||
| sbic->set_service_chain_info(sbscc); | ||
| } | ||
|
|
||
| vector<ShowBgpStaticRouteConfig> static_route_list; | ||
| BOOST_FOREACH(const StaticRouteConfig &rtconfig, | ||
| instance->static_routes()) { | ||
| ShowBgpStaticRouteConfig sbsrc; | ||
| string prefix = rtconfig.address.to_string() + "/"; | ||
| prefix += integerToString(rtconfig.prefix_length); | ||
| sbsrc.set_prefix(prefix); | ||
| sbsrc.set_targets(rtconfig.route_target); | ||
| sbsrc.set_nexthop(rtconfig.nexthop.to_string()); | ||
| static_route_list.push_back(sbsrc); | ||
| } | ||
| if (!static_route_list.empty()) | ||
| sbic->set_static_routes(static_route_list); | ||
| } | ||
|
|
||
| // | ||
| // Specialization of BgpShowHandler<>::CallbackCommon. | ||
| // | ||
| template <> | ||
| bool BgpShowHandler<ShowBgpInstanceConfigReq, ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, ShowBgpInstanceConfig>::CallbackCommon( | ||
| const BgpSandeshContext *bsc, Data *data) { | ||
| uint32_t page_limit = bsc->page_limit() ? bsc->page_limit() : kPageLimit; | ||
| uint32_t iter_limit = bsc->iter_limit() ? bsc->iter_limit() : kIterLimit; | ||
| const BgpConfigManager *bcm = bsc->bgp_server->config_manager(); | ||
|
|
||
| BgpConfigManager::InstanceMapRange range = | ||
| bcm->InstanceMapItems(data->next_entry); | ||
| BgpConfigManager::InstanceMap::const_iterator it = range.first; | ||
| BgpConfigManager::InstanceMap::const_iterator it_end = range.second; | ||
| for (uint32_t iter_count = 0; it != it_end; ++it, ++iter_count) { | ||
| const BgpInstanceConfig *instance = it->second; | ||
| if (!data->search_string.empty() && | ||
| (instance->name().find(data->search_string) == string::npos)) { | ||
| continue; | ||
| } | ||
|
|
||
| ShowBgpInstanceConfig sbic; | ||
| FillBgpInstanceConfigInfo(&sbic, bsc, instance); | ||
| data->show_list.push_back(sbic); | ||
| if (data->show_list.size() >= page_limit) | ||
| break; | ||
| if (iter_count >= iter_limit) | ||
| break; | ||
| } | ||
|
|
||
| // All done if we've looked at all instances. | ||
| if (it == it_end || ++it == it_end) | ||
| return true; | ||
|
|
||
| // Return true if we've reached the page limit, false if we've reached the | ||
| // iteration limit. | ||
| bool done = data->show_list.size() >= page_limit; | ||
| SaveContextToData(it->second->name(), done, data); | ||
| return done; | ||
| } | ||
|
|
||
| // | ||
| // Specialization of BgpShowHandler<>::FillShowList. | ||
| // | ||
| template <> | ||
| void BgpShowHandler<ShowBgpInstanceConfigReq, ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, ShowBgpInstanceConfig>::FillShowList( | ||
| ShowBgpInstanceConfigResp *resp, | ||
| const vector<ShowBgpInstanceConfig> &show_list) { | ||
| resp->set_instances(show_list); | ||
| } | ||
|
|
||
| // | ||
| // Handler for ShowBgpInstanceConfigReq. | ||
| // | ||
| void ShowBgpInstanceConfigReq::HandleRequest() const { | ||
| RequestPipeline::PipeSpec ps(this); | ||
| RequestPipeline::StageSpec s1; | ||
| TaskScheduler *scheduler = TaskScheduler::GetInstance(); | ||
|
|
||
| s1.taskId_ = scheduler->GetTaskId("bgp::ShowCommand"); | ||
| s1.cbFn_ = boost::bind(&BgpShowHandler< | ||
| ShowBgpInstanceConfigReq, | ||
| ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, | ||
| ShowBgpInstanceConfig>::Callback, _1, _2, _3, _4, _5); | ||
| s1.allocFn_ = BgpShowHandler< | ||
| ShowBgpInstanceConfigReq, | ||
| ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, | ||
| ShowBgpInstanceConfig>::CreateData; | ||
| s1.instances_.push_back(0); | ||
| ps.stages_.push_back(s1); | ||
| RequestPipeline rp(ps); | ||
| } | ||
|
|
||
| // | ||
| // Handler for ShowBgpInstanceConfigReqIterate. | ||
| // | ||
| void ShowBgpInstanceConfigReqIterate::HandleRequest() const { | ||
| RequestPipeline::PipeSpec ps(this); | ||
| RequestPipeline::StageSpec s1; | ||
| TaskScheduler *scheduler = TaskScheduler::GetInstance(); | ||
|
|
||
| s1.taskId_ = scheduler->GetTaskId("bgp::ShowCommand"); | ||
| s1.cbFn_ = boost::bind(&BgpShowHandler< | ||
| ShowBgpInstanceConfigReq, | ||
| ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, | ||
| ShowBgpInstanceConfig>::CallbackIterate, _1, _2, _3, _4, _5); | ||
| s1.allocFn_ = BgpShowHandler< | ||
| ShowBgpInstanceConfigReq, | ||
| ShowBgpInstanceConfigReqIterate, | ||
| ShowBgpInstanceConfigResp, | ||
| ShowBgpInstanceConfig>::CreateData; | ||
| s1.instances_.push_back(0); | ||
| ps.stages_.push_back(s1); | ||
| RequestPipeline rp(ps); | ||
| } |
Oops, something went wrong.