Merge "Fix corner case in RoutePathReplicator" into R2.20

Juniper · Jun 12, 2015 · fc41579 · fc41579
2 parents 9e95fa8 + eedf0d9
commit fc41579
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/bgp/routing-instance/routepath_replicator.cc b/src/bgp/routing-instance/routepath_replicator.cc
@@ -195,11 +195,20 @@ void RoutePathReplicator::DeleteTableState(BgpTable *table) {
     delete ts;
 }
 
+//
+// Enqueue BgpTable to unregister list if the TableState is empty.
+//
+// Skip if the BgpTable is still on the bulk sync list.  This can
+// happen if we're called from the bgp::Config Task and a previous
+// walk is still in progress.
+//
 void RoutePathReplicator::UnregisterTableState(BgpTable *table) {
     CHECK_CONCURRENCY("bgp::Config", "db::DBTable");
     const TableState *ts = FindTableState(table);
     if (!ts->empty())
         return;
+    if (bulk_sync_.find(table) != bulk_sync_.end())
+        return;
     unreg_table_list_.insert(table);
     unreg_trigger_->Set();
 }