Changeset 2345

Timestamp:

01/16/12 08:24:11 (17 months ago)

Author:

peter

Message:

backport r2109 to fix slave crashes

Location:

tags/pdns-2-9-22-x/pdns

Files:

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

tags/pdns-2-9-22-x/pdns/dnsbackend.hh

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

tags/pdns-2-9-22-x/pdns/slavecommunicator.cc

@@ -61 +61 @@
   L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
   uint32_t domain_id;
-  PacketHandler P;
+  PacketHandler P; // fresh UeberBackend
 
   DomainInfo di;
@@ -72 +72 @@
     UeberBackend *B=dynamic_cast<UeberBackend *>(P.getBackend());
 
-    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;
@@ -165 +165 @@
 {
   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!
 }
@@ -242 +244 @@
     if(!ssr.d_serials.count(di.id)) 
       continue;
+    if(!di.backend) // might've come from the packethandler
+      B->getDomainInfo(di.zone, di);
     uint32_t theirserial = ssr.d_serials[di.id], ourserial = di.serial;