Changeset 523 for trunk

Timestamp:

06/12/13 17:17:57 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Swap forward and reverse zone export order to better handle dangling =
records created by tiny-import.pl's -l option. Exporting all reverse-zone
pseudotype records first will let us ignore most of them while exporting
forward zones, without skipping the dangling ones not associated with a
reverse zone.

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -4883 +4883 @@
   my %recflags;
 
-  my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1");
-  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
-        "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
-  my $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
-  $domsth->execute();
-  while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
-##fixme: need to find a way to block opening symlinked files without introducing a race.
-#       O_NOFOLLOW
-#              If  pathname  is a symbolic link, then the open fails.  This is a FreeBSD extension, which was
-#              added to Linux in version 2.1.126.  Symbolic links in earlier components of the pathname  will
-#              still be followed.
-# but that doesn't help other platforms.  :/
-    my $cachefile = "$self->{exportcache}/$dom";
-    my $tmpcache = "$self->{exportcache}/tmp.$dom.$$";
-    eval {
-
-      # only update the cache file if the zone has changed, or if the cache file has nothing in it.
-      if ($changed || !-e $cachefile || -z $cachefile) {
-        open ZONECACHE, ">$tmpcache" or die "Error creating temporary file $tmpcache: $!\n";
-
-        $recsth->execute($domid);
-        while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
-          next if $recflags{$recid};
-
-          $loc = '' if !$loc;   # de-nullify - just in case
-##fixme:  handle case of record-with-location-that-doesn't-exist better.
-# note this currently fails safe (tested) - records with a location that
-# doesn't exist will not be sent to any client
-#       $loc = '' if !$lochash->{$loc};
-
-##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
-# note $ttl must be set to 0 if we want to use tinydns's auto-expiring timestamps.
-# timestamps are TAI64
-# ~~ 2^62 + time()
-          my $stamp = '';
-
-          # support tinydns' auto-TTL
-          $ttl = '' if $ttl == -1;
-
-          # Spaces are evil.
-          $host =~ s/^\s+//;
-          $host =~ s/\s+$//;
-          if ($typemap{$type} ne 'TXT') {
-            # Leading or trailng spaces could be legit in TXT records.
-            $val =~ s/^\s+//;
-            $val =~ s/\s+$//;
-          }
-
-          _printrec_tiny(*ZONECACHE, 'n', \%recflags,
-                $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
-                if *ZONECACHE;
-
-          $recflags{$recid} = 1;
-
-        } # while ($recsth)
-
-        close ZONECACHE; # force the file to be written
-
-        # catch obvious write errors that leave an empty temp file
-        if (-s $tmpcache) {
-          rename $tmpcache, $cachefile
-            or die "Error overwriting cache file $cachefile with temporary file: $!\n";
-        }
-
-      } # if $changed or cache filesize is 0
-
-    };
-    if ($@) {
-      print "error writing new data for $dom: $@\n";
-      # error!  something borked, and we should be able to fall back on the old cache file
-      # report the error, somehow.
-    } else {
-      # mark domain as unmodified.  Only do this if no errors, that way
-      # export failures should recover a little more automatically.
-      $zonesth->execute($domid);
-    }
-    # Always stream the cache (even if stale or obsolete due to errors creating the new cache)
-    open CACHE, "<$cachefile";
-    print $datafile $_ while <CACHE>;
-    close CACHE;
-
-  } # while ($domsth)
-
 # For reasons unknown, we can't sanely UNION these statements.  Feh.
 # Supposedly it should work though (note last 3 lines):
@@ -4980 +4897 @@
   my $soasth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND type=6");
-  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
+  my $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
         "FROM records WHERE rdns_id=? AND not type=6 ".
         "ORDER BY masklen(CAST(val AS inet)) DESC, CAST(val AS inet)");
   my $revsth = $dbh->prepare("SELECT rdns_id,revnet,status,changed FROM revzones WHERE status=1 ".
         "ORDER BY masklen(revnet) DESC");
-  $zonesth = $dbh->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
+  my $zonesth = $dbh->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
   $revsth->execute();
   while (my ($revid,$revzone,$revstat,$changed) = $revsth->fetchrow_array) {
@@ -5058 +4975 @@
       # export failures should recover a little more automatically.
       $zonesth->execute($revid);
+    }
+    # Always stream the cache (even if stale or obsolete due to errors creating the new cache)
+    open CACHE, "<$cachefile";
+    print $datafile $_ while <CACHE>;
+    close CACHE;
+
+  } # while ($revsth)
+
+  my $domsth = $dbh->prepare("SELECT domain_id,domain,status,changed FROM domains WHERE status=1");
+  $recsth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl,record_id,location ".
+        "FROM records WHERE domain_id=?");      # Just exclude all types relating to rDNS
+#       "FROM records WHERE domain_id=? AND type < 65280");     # Just exclude all types relating to rDNS
+  $zonesth = $dbh->prepare("UPDATE domains SET changed='n' WHERE domain_id=?");
+  $domsth->execute();
+  while (my ($domid,$dom,$domstat,$changed) = $domsth->fetchrow_array) {
+##fixme: need to find a way to block opening symlinked files without introducing a race.
+#       O_NOFOLLOW
+#              If  pathname  is a symbolic link, then the open fails.  This is a FreeBSD extension, which was
+#              added to Linux in version 2.1.126.  Symbolic links in earlier components of the pathname  will
+#              still be followed.
+# but that doesn't help other platforms.  :/
+    my $cachefile = "$self->{exportcache}/$dom";
+    my $tmpcache = "$self->{exportcache}/tmp.$dom.$$";
+    eval {
+
+      # only update the cache file if the zone has changed, or if the cache file has nothing in it.
+      if ($changed || !-e $cachefile || -z $cachefile) {
+        open ZONECACHE, ">$tmpcache" or die "Error creating temporary file $tmpcache: $!\n";
+
+        $recsth->execute($domid);
+        while (my ($host,$type,$val,$dist,$weight,$port,$ttl,$recid,$loc) = $recsth->fetchrow_array) {
+          next if $recflags{$recid};
+
+          $loc = '' if !$loc;   # de-nullify - just in case
+##fixme:  handle case of record-with-location-that-doesn't-exist better.
+# note this currently fails safe (tested) - records with a location that
+# doesn't exist will not be sent to any client
+#       $loc = '' if !$lochash->{$loc};
+
+##fixme:  record validity timestamp. tinydns supports fiddling with timestamps.
+# note $ttl must be set to 0 if we want to use tinydns's auto-expiring timestamps.
+# timestamps are TAI64
+# ~~ 2^62 + time()
+          my $stamp = '';
+
+          # support tinydns' auto-TTL
+          $ttl = '' if $ttl == -1;
+
+          # Spaces are evil.
+          $host =~ s/^\s+//;
+          $host =~ s/\s+$//;
+          if ($typemap{$type} ne 'TXT') {
+            # Leading or trailng spaces could be legit in TXT records.
+            $val =~ s/^\s+//;
+            $val =~ s/\s+$//;
+          }
+
+          _printrec_tiny(*ZONECACHE, 'n', \%recflags,
+                $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
+                if *ZONECACHE;
+
+          $recflags{$recid} = 1;
+
+        } # while ($recsth)
+
+        close ZONECACHE; # force the file to be written
+
+        # catch obvious write errors that leave an empty temp file
+        if (-s $tmpcache) {
+          rename $tmpcache, $cachefile
+            or die "Error overwriting cache file $cachefile with temporary file: $!\n";
+        }
+
+      } # if $changed or cache filesize is 0
+
+    };
+    if ($@) {
+      print "error writing new data for $dom: $@\n";
+      # error!  something borked, and we should be able to fall back on the old cache file
+      # report the error, somehow.
+    } else {
+      # mark domain as unmodified.  Only do this if no errors, that way
+      # export failures should recover a little more automatically.
+      $zonesth->execute($domid);
     }
     # Always stream the cache (even if stale or obsolete due to errors creating the new cache)