revert the actual lock bit of r2807, as it causes more parallel transfers of the...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2818 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index 28aa63c2badc0dc26c70a0a889d5259432a5db45..ddc9fbbef58dfe8f3b422b8db772594b154240b4 100644 (file)
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -45,6 +45,7 @@ void CommunicatorClass::retrievalLoopThread(void)
         continue;
        
       sr=d_suckdomains.front();
+      d_suckdomains.pop_front();
     }
     try {
       suck(sr.domain,sr.master);
@@ -52,12 +53,6 @@ void CommunicatorClass::retrievalLoopThread(void)
     catch(AhuException& ae) {
       cerr<<"Error: "<<ae.reason<<endl;
     }
-
-    {
-      Lock l(&d_lock);
-      domains_by_name_t& uqIndex = d_suckdomains.get<IDTag>();
-      uqIndex.erase(sr);
-    }
   }
 
 }

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 04bf34d56bce4d4eea03f3baf693ed2a7e5827c8..869d8102f6366cb7cdae578127984de230b49579 100644 (file)
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -518,7 +518,6 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
       // remove unfresh domains already queued for AXFR, no sense polling them again
       sr.master=*di.masters.begin();
       if(nameindex.count(sr)) {
-        L<<Logger::Warning<<"Domain "<<sr.domain<<" already queued for AXFR."<<endl;
         continue;
       }
       DomainNotificationInfo dni;