Changeset 686

Timestamp:

01/29/15 16:47:08 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Put a bit of polish on updating DNS records when updating containers
(particularly when the container is the master block). We don't want
to stomp downstream subs, so we only update free blocks. This may result
in new DNS "sub" blocks, but when things get deleted far enough up the
chain they all go away anyway.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1301 +1301 @@
   }
 
-  $binfo->{block} =~ s|/32$||;
-  _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $args{rdns}, rpcuser => $args{user});
-
-  # and the per-IP set, if there is one.
-  _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user});
+  # In case of any container (mainly master block), only update freeblocks so we don't stomp subs
+  # (which would be the wrong thing in pretty much any case except "DELETE ALL EVARYTHING!!1!oneone!")
+  if ($binfo->{type} =~ '.[mc]') {
+    # Not using listFree() as it doesn't return quite all of the blocks wanted.
+    # Retrieve the immediate free blocks
+    my $sth = $dbh->prepare(q(
+        SELECT cidr FROM freeblocks WHERE parent_id = ?
+        UNION
+        SELECT cidr FROM freeblocks f WHERE
+                cidr = (SELECT cidr FROM allocations a WHERE f.cidr = a.cidr)
+                AND master_id = ?
+        ) );
+    $sth->execute($args{block}, $binfo->{master_id});
+    my %fbset;
+    while (my ($fb) = $sth->fetchrow_array) {
+      $fbset{"host_$fb"} = $args{rdns};
+    }
+    # We use this RPC call instead of multiple addOrUpdateRevRec calls, since we don't
+    # know how many records we'll be updating and more than 3-4 is far too slow.  This
+    # should be safe to call unconditionally.
+    # Requires dnsadmin >= r678
+    _rpc('updateRevSet', %fbset, rpcuser => $args{user});
+
+  } else {
+    $binfo->{block} =~ s|/32$||;
+    _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $args{rdns}, rpcuser => $args{user});
+
+    # and the per-IP set, if there is one.
+    _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user}) if keys (%{$args{iprev}});
+  }
 
   return ('OK','OK');