Changeset 2109

Timestamp:

03/31/11 09:51:27 (2 years ago)

Author:

ahu

Message:

fix crashes reported by Vasiliy G Tolstov and Frank Altpeter - turns out we were handing a copy of the database connection to the master/slave connection.. while we were still using it!

Location:

trunk/pdns/pdns

Files:

• dnsbackend.hh (modified) (1 diff)
• slavecommunicator.cc (modified) (5 diffs)

trunk/pdns/pdns/dnsbackend.hh

@@ -44 +44 @@
 struct DomainInfo
 {
+  DomainInfo() : backend(0) {}
   uint32_t id;
   string zone;

trunk/pdns/pdns/slavecommunicator.cc

@@ -72 +72 @@
   L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
   uint32_t domain_id;
-  PacketHandler P;
+  PacketHandler P; // fresh UeberBackend
 
   DomainInfo di;
@@ -78 +78 @@
   bool first=true;    
   try {
-    UeberBackend *B=dynamic_cast<UeberBackend *>(P.getBackend());
+    UeberBackend *B=dynamic_cast<UeberBackend *>(P.getBackend());  // copy of the same UeberBackend
     NSEC3PARAMRecordContent ns3pr;
     bool narrow;
-    DNSSECKeeper dk;
+    DNSSECKeeper dk; // has its own ueberbackend
     bool dnssecZone = false;
     bool haveNSEC3=false;
@@ -98 +98 @@
                 }    
 
-    if(!B->getDomainInfo(domain, di) || !di.backend) {
+    if(!B->getDomainInfo(domain, di) || !di.backend) { // di.backend and B are mostly identical
       L<<Logger::Error<<"Can't determine backend for domain '"<<domain<<"'"<<endl;
       return;
@@ -288 +288 @@
 {
   Lock l(&d_lock);
-  d_tocheck.insert(di);
+  DomainInfo ours = di;
+  ours.backend = 0;
+  d_tocheck.insert(ours);
   d_any_sem.post(); // kick the loop!
 }
@@ -365 +367 @@
   BOOST_FOREACH(val_t& val, sdomains) {
     DomainInfo& di(val.first);
+    if(!di.backend) // might've come from the packethandler
+      B->getDomainInfo(di.zone, di);
     if(!ssr.d_freshness.count(di.id)) 
       continue;