Merge "Prevent instance/table from getting deleted while iterating"

Juniper · Aug 14, 2015 · 4e408f7 · 4e408f7
2 parents f60f8bd + 40a2a9c
commit 4e408f7
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/bgp/test/bgp_show_route_summary_test.cc b/src/bgp/test/bgp_show_route_summary_test.cc
@@ -145,7 +145,8 @@ class BgpShowRouteSummaryTest : public ::testing::Test {
         }
     }
 
-    void PauseTableDeletion() {
+    void PauseResumeTableDeletion(bool pause) {
+        task_util::TaskSchedulerLock lock;
         RoutingInstanceMgr *rim = server_->routing_instance_mgr();
         for (RoutingInstanceMgr::name_iterator it1 = rim->name_begin();
              it1 != rim->name_end(); ++it1) {
@@ -154,23 +155,21 @@ class BgpShowRouteSummaryTest : public ::testing::Test {
                  rtinstance->GetTables().begin();
                  it2 != rtinstance->GetTables().end(); ++it2) {
                 BgpTable *table = it2->second;
-                table->deleter()->PauseDelete();
+                if (pause) {
+                    table->deleter()->PauseDelete();
+                } else {
+                    table->deleter()->ResumeDelete();
+                }
             }
         }
     }
 
+    void PauseTableDeletion() {
+        PauseResumeTableDeletion(true);
+    }
+
     void ResumeTableDeletion() {
-        RoutingInstanceMgr *rim = server_->routing_instance_mgr();
-        for (RoutingInstanceMgr::name_iterator it1 = rim->name_begin();
-             it1 != rim->name_end(); ++it1) {
-            RoutingInstance *rtinstance = it1->second;
-            for (RoutingInstance::RouteTableList::iterator it2 =
-                 rtinstance->GetTables().begin();
-                 it2 != rtinstance->GetTables().end(); ++it2) {
-                BgpTable *table = it2->second;
-                table->deleter()->ResumeDelete();
-            }
-        }
+        PauseResumeTableDeletion(false);
     }
 
     EventManager evm_;