Changeset 450

Timestamp:

01/10/13 17:23:03 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix caching glitch in reverse record export by simplifying the
caching mechanism so that new writes are always done to the cache,
then the cache is always streamed to the final target.

It's not yet clear if this will provide a minor speed boost or
slowdown, or if any change will be lost in the noise.

File:

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

trunk/DNSDB.pm

@@ -4701 +4701 @@
         }
 
-        _printrec_tiny($datafile, 'n', \%recflags,
-                $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp);
-
         _printrec_tiny(*ZONECACHE, 'n', \%recflags,
                 $dom, $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
                 if *ZONECACHE;
+
         # in case the zone shrunk, get rid of garbage at the end of the file.
         truncate(ZONECACHE, tell(ZONECACHE));
@@ -4712 +4710 @@
         $recflags{$recid} = 1;
       } # while ($recsth)
-    } else {
-      # domain not changed, stream from cache
-      print $datafile $_ while <ZONECACHE>;
-    }
+    }
+    # stream from cache, whether freshly created or existing
+    print $datafile $_ while <ZONECACHE>;
     close ZONECACHE;
     # mark domain as unmodified
@@ -4757 +4754 @@
       $soasth->execute($revid);
       my (@zsoa) = $soasth->fetchrow_array();
-      _printrec_tiny($datafile,'y',\%recflags,$revzone,
-        $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
       _printrec_tiny(*ZONECACHE,'y',\%recflags,$revzone,
         $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
@@ -4781 +4776 @@
         $ttl = '' if $ttl == '0';
 
-        _printrec_tiny($datafile, 'y', \%recflags, $revzone,
-                $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp);
         _printrec_tiny(*ZONECACHE, 'y', \%recflags, $revzone,
                 $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp)
                 if *ZONECACHE;
-        # in case the zone shrunk, get rid of garbage at the end of the file.
-        truncate(ZONECACHE, tell(ZONECACHE));
+
+        # in case the zone shrunk, get rid of garbage at the end of the file.
+        truncate(ZONECACHE, tell(ZONECACHE));
 
         $recflags{$recid} = 1;
       } # while ($recsth)
-    } else {
-      # zone not changed, stream from cache
-      print $datafile $_ while <ZONECACHE>;
-    }
+    }
+    # stream from cache, whether freshly created or existing
+    print $datafile $_ while <ZONECACHE>;
     close ZONECACHE;
-    # mark domain as unmodified
+    # mark zone as unmodified
     $zonesth->execute($revid);
   } # while ($domsth)