Merge "Collect UVE information off bgp::ShowCommand task" into R3.1

Juniper · Dec 6, 2016 · 5799b70 · 5799b70
2 parents d67cfce + a975f6e
commit 5799b70
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/src/bgp/bgp_server.cc b/src/bgp/bgp_server.cc
@@ -716,7 +716,7 @@ void BgpServer::NotifyAllStaticRoutes() {
 }
 
 uint32_t BgpServer::GetStaticRouteCount() const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
     uint32_t count = 0;
     for (StaticRouteMgrList::iterator it = srt_manager_list_.begin();
          it != srt_manager_list_.end(); ++it) {
@@ -727,7 +727,7 @@ uint32_t BgpServer::GetStaticRouteCount() const {
 }
 
 uint32_t BgpServer::GetDownStaticRouteCount() const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
     uint32_t count = 0;
     for (StaticRouteMgrList::iterator it = srt_manager_list_.begin();
          it != srt_manager_list_.end(); ++it) {
@@ -833,7 +833,7 @@ void BgpServer::FillPeerStats(const BgpPeer *peer) const {
 }
 
 bool BgpServer::CollectStats(BgpRouterState *state, bool first) const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
 
     VisitBgpPeers(boost::bind(&BgpServer::FillPeerStats, this, _1));
     bool change = false;

diff --git a/src/bgp/bgp_table.cc b/src/bgp/bgp_table.cc
@@ -642,7 +642,7 @@ void BgpTable::DestroyPathResolver() {
 }
 
 size_t BgpTable::GetPendingRiboutsCount(size_t *markers) const {
-    CHECK_CONCURRENCY("bgp::ShowCommand", "bgp::Config", "bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand", "bgp::Config");
     size_t count = 0;
     *markers = 0;
 

diff --git a/src/bgp/bgp_xmpp_channel.cc b/src/bgp/bgp_xmpp_channel.cc
@@ -2857,7 +2857,7 @@ void BgpXmppChannelManager::FillPeerInfo(const BgpXmppChannel *channel) const {
 
 bool BgpXmppChannelManager::CollectStats(BgpRouterState *state, bool first)
          const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
 
     VisitChannels(boost::bind(&BgpXmppChannelManager::FillPeerInfo, this, _1));
     bool change = false;

diff --git a/src/bgp/routing-instance/static_route.cc b/src/bgp/routing-instance/static_route.cc
@@ -911,13 +911,13 @@ void StaticRouteMgr<T>::EnableUnregisterTrigger() {
 
 template <typename T>
 uint32_t StaticRouteMgr<T>::GetRouteCount() const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
     return static_route_map_.size();
 }
 
 template <typename T>
 uint32_t StaticRouteMgr<T>::GetDownRouteCount() const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
     uint32_t count = 0;
     for (typename StaticRouteMap::const_iterator it = static_route_map_.begin();
          it != static_route_map_.end(); ++it) {

diff --git a/src/bgp/test/static_route_test.cc b/src/bgp/test/static_route_test.cc
@@ -775,12 +775,12 @@ class StaticRouteTest : public ::testing::Test {
     }
 
     void VerifyStaticRouteCount(uint32_t count) {
-        ConcurrencyScope scope("bgp::Uve");
+        ConcurrencyScope scope("bgp::ShowCommand");
         TASK_UTIL_EXPECT_EQ(count, bgp_server_->num_static_routes());
     }
 
     void VerifyDownStaticRouteCount(uint32_t count) {
-        ConcurrencyScope scope("bgp::Uve");
+        ConcurrencyScope scope("bgp::ShowCommand");
         TASK_UTIL_EXPECT_EQ(count, bgp_server_->num_down_static_routes());
     }
 

diff --git a/src/control-node/control_node.cc b/src/control-node/control_node.cc
@@ -44,7 +44,6 @@ void ControlNode::SetDefaultSchedulingPolicy() {
         (TaskExclusion(scheduler->GetTaskId("bgp::ShowCommand")))
         (TaskExclusion(scheduler->GetTaskId("bgp::SendReadyTask")))
         (TaskExclusion(scheduler->GetTaskId("bgp::StaticRoute")))
-        (TaskExclusion(scheduler->GetTaskId("bgp::Uve")))
         (TaskExclusion(scheduler->GetTaskId("bgp::RouteAggregation")))
         (TaskExclusion(scheduler->GetTaskId("bgp::ResolverPath")))
         (TaskExclusion(scheduler->GetTaskId("bgp::ResolverNexthop")));

diff --git a/src/control-node/main.cc b/src/control-node/main.cc
@@ -552,7 +552,7 @@ int main(int argc, char *argv[]) {
             boost::bind(&ControlNodeInfoLogger,
                         bgp_server.get(), bgp_peer_manager.get(),
                         &ifmap_server, node_info_log_timer.get()),
-            TaskScheduler::GetInstance()->GetTaskId("bgp::Uve"), 0));
+            TaskScheduler::GetInstance()->GetTaskId("bgp::ShowCommand"), 0));
 
     // Start periodic timer to send BGPRouterInfo UVE.
     node_info_log_timer->Start(

diff --git a/src/ifmap/ifmap_server.cc b/src/ifmap/ifmap_server.cc
@@ -522,7 +522,7 @@ void IFMapServer::GetUIInfo(IFMapServerInfoUI *server_info) const {
 }
 
 bool IFMapServer::CollectStats(BgpRouterState *state, bool first) const {
-    CHECK_CONCURRENCY("bgp::Uve");
+    CHECK_CONCURRENCY("bgp::ShowCommand");
 
     IFMapPeerServerInfoUI peer_server_info;
     bool change = false;