Merge "Cleanup deported record list on detecting named UP." into R3.2

Juniper · Feb 28, 2017 · 9c6969c · 9c6969c
2 parents 1351903 + cda824a
commit 9c6969c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/dns/mgr/dns_mgr.cc b/src/dns/mgr/dns_mgr.cc
@@ -683,6 +683,7 @@ void DnsManager::BindEventHandler(BindStatus::Event event) {
             DNS_OPERATIONAL_LOG(
                 g_vns_constants.CategoryNames.find(Category::DNSAGENT)->second,
                 SandeshLevel::SYS_NOTICE, "BIND named up; DNS is operational");
+            ClearDeportedPendingList();
             UpdateAll();
             break;
         }

diff --git a/src/dns/mgr/dns_mgr.h b/src/dns/mgr/dns_mgr.h
@@ -92,6 +92,7 @@ class DnsManager {
         return (true);
     }
     PendingListMap GetDeportedPendingListMap() { return dp_pending_map_; }
+    void ClearDeportedPendingList() { dp_pending_map_.clear(); }
     void NotifyThrottledDnsRecords();
     void DnsConfigMsgHandler(const std::string &key, const std::string &context) const;
     void VdnsRecordsMsgHandler(const std::string &key, const std::string &context, bool show_all = false) const;