Avoid metadata mixup in some slaving cases. Patch by Kees Monshouwer, closing #603

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

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 8dcce8daca6b80050b9f57a4c431cccb15d70f49..c12cc5a2426c608aaab3a7e19c82a0e5e2dde7eb 100644 (file)
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -324,10 +324,6 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
       }
     }
 
-    di.backend->commitTransaction();
-    di.backend->setFresh(domain_id);
-    PC.purge(domain+"$");
-
     // now we also need to update the presigned flag and NSEC3PARAM
     // for the zone
     if (gotPresigned) {
@@ -359,6 +355,10 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
       dk.unsetNSEC3PARAM(domain);
     }
 
+    di.backend->commitTransaction();
+    di.backend->setFresh(domain_id);
+    PC.purge(domain+"$");
+
 
     L<<Logger::Error<<"AXFR done for '"<<domain<<"', zone committed with serial number "<<soa_serial<<endl;
     if(::arg().mustDo("slave-renotify"))

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index cbdddfa7ee4817bf5b97d46c290e4fc947add3e8..11d21e1472abc52357a3635e8f30bd96010bd418 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -541,11 +541,6 @@ then
                        --cache-ttl=0 --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 &
                echo 'waiting for zones to be loaded'
                bindwait bind-slave
-               echo 'reloading zones to work around metadata bug'
-               for zone in $(grep zone named.conf  | cut -f2 -d\")
-               do
-                       ../pdns/pdns_control --no-config --socket-dir=. --config-name=bind-slave bind-reload-now $zone
-               done
        fi
 fi