requeue serial check if NOTIFY comes in while incoming AXFR is ongoing

(cherry picked from commit 7d4ac70c97fffe7916ef8b8585dd9552c9a59517)

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index e73eecb8ff655ffd82694d21ac87cec82b55b102..7db5a3e5b6737a2368059311400d8bd115e95bf5 100644 (file)
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -125,8 +125,17 @@ void CommunicatorClass::mainloop(void)
       while(time(0) < next) {
         rc=d_any_sem.tryWait();
 
-        if(rc)
+        if(rc) {
+          bool extraSlaveRefresh = false;
           Utility::sleep(1);
+          {
+            Lock l(&d_lock);
+            if (d_tocheck.size())
+              extraSlaveRefresh = true;
+          }
+          if (extraSlaveRefresh)
+            slaveRefresh(&P);
+        }
         else { 
           break; // something happened
         }

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 732699024db143c03e8ceee16f95f5a3def09aed..4e05ed2bbee37f8a8a5e5af3ee239cd1b751e036 100644 (file)
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -735,8 +735,20 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
 
   {
     Lock l(&d_lock);
-    rdomains.insert(rdomains.end(), d_tocheck.begin(), d_tocheck.end());
-    d_tocheck.clear();
+
+    set<DomainInfo> requeue;
+    for(const auto& di: d_tocheck) {
+      if(d_inprogress.count(di.zone)) {
+        g_log<<Logger::Debug<<"Got NOTIFY for "<<di.zone<<" while AXFR in progress, requeueing SOA check"<<endl;
+        requeue.insert(di);
+      }
+      else {
+        g_log<<Logger::Debug<<"Got NOTIFY for "<<di.zone<<", going to check SOA serial"<<endl;
+        rdomains.push_back(di);
+      }
+    }
+    d_tocheck.swap(requeue);
+
     trysuperdomains.insert(trysuperdomains.end(), d_potentialsupermasters.begin(), d_potentialsupermasters.end());
     d_potentialsupermasters.clear();
   }