Changeset 774 for trunk

Timestamp:

09/09/15 18:05:19 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Rearrange, fiddle, and rewrite-ish splitBlock() due to an edge case
with free blocks that wouldn't go away with smaller changes.

File:

• trunk/cgi-bin/IPDB.pm (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1898 +1898 @@
   my $dbh = shift;
   my %args = @_;
-#  my $id = shift;
-#  my $basetype = shift;
-#  my $newmask = shift;
 
 ##fixme:  set errstr on errors so caller can suitably clue-by-four the user
@@ -1959 +1956 @@
     my $allocsth = $dbh->prepare("INSERT INTO allocations (cidr, $fields_sql)".
         " VALUES (?".',?'x(scalar(@fieldlist)).")");
+    my $allocsth2 = $dbh->prepare(qq(
+        INSERT INTO allocations (cidr, $fields_sql)
+                SELECT ? AS cidr, $fields_sql
+                FROM allocations
+                WHERE id = ?
+        ) );
     my $nbsth = $dbh->prepare("DELETE FROM poolips WHERE parent_id = ? AND ip = ?");
     my $upd_psth = $dbh->prepare("UPDATE allocations SET parent_id = ? WHERE parent_id = ? AND cidr <<= ?");
@@ -1967 +1970 @@
     my $pool_msth = $dbh->prepare("UPDATE poolips SET master_id = ? WHERE master_id = ? AND ip <<= ?");
 
-    # set up update of existing block
-    $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$newblocks[0]", $args{id}) );
-
-    # axe the new bcast IP from the smaller pool at the "base" block, if it's a "normal" pool
-    if ($binfo->{type} =~ /.d/) {
-      $newblocks[0]--;
-      $nbsth->execute($args{id}, $newblocks[0]->addr);
-    }
-
-    # Holder for freeblocks-to-delete.  Should be impossible to have more than one...
-    my %fbdel;
-
-    # Loop over the new blocks that are not the base block
-    for (my $i = 1; $i <= $#newblocks; $i++) {
-      # add the new allocation
-      $allocsth->execute($newblocks[$i], @vals);
-      # fetch the ID of the entry we just added...
-      $idsth->execute();
-      my ($nid) = $idsth->fetchrow_array();
-      # ... so we can pass back the list of blocks and IDs...
-      push @ret, {nid => $nid, nblock => "$newblocks[$i]"};
-      # axe the net, gw, and bcast IPs as necessary when splitting a "normal" pool
-      if ($binfo->{type} =~ /.d/) {
-        # net
-        $nbsth->execute($args{id}, $newblocks[$i]->addr);
-        $newblocks[$i]++;
-        # gw
-        $nbsth->execute($args{id}, $newblocks[$i]->addr);
-        $newblocks[$i]--;
-        $newblocks[$i]--;
-        # bcast
-        $nbsth->execute($args{id}, $newblocks[$i]->addr);
-        $newblocks[$i]++;
-      } # $binfo->{type} =~ /.d/
-
-      # Check for free blocks larger than the new mask length, and split those as needed.
-      if ($binfo->{type} =~ /.[cm]/) {
-        # get a "list" of freeblocks bigger than the allocation in the parent.  there's only one, right?
-        my $fblist = $dbh->selectall_arrayref("SELECT id FROM freeblocks WHERE cidr >> ? AND parent_id = ? ", 
-            {Slice=>{}}, $newblocks[$i], $args{id});
-        if (@$fblist) {
-          # create a new freeblock for the new block we created earlier
-          $dbh->do(q{
-            INSERT INTO freeblocks (cidr, parent_id, master_id, city, routed,vrf)
-                SELECT ? AS cidr, ? AS parent_id, master_id, city, routed, vrf FROM freeblocks
-                WHERE id = ?
-            }, undef, ($newblocks[$i], $nid, $fblist->[0]->{id}) );
-          $fbdel{$fblist->[0]->{id}}++;
+    my @clist;
+    _getChildren($dbh, $args{id}, $binfo->{master_id}, \@clist, $block);
+
+    my @processlist;
+    push @processlist, { id => $args{id}, cidr => $block, mask => $block->masklen, type => $binfo->{type} };
+    foreach (@clist) {
+      $_->{cidr} = new NetAddr::IP $_->{cidr};
+      if ($_->{cidr}->masklen < $args{newmask}) {
+        $_->{mask} = $_->{cidr}->masklen;
+        push @processlist, $_;
+      }
+    }
+
+    @processlist = sort { $b->{cidr}->masklen <=> $a->{cidr}->masklen } @processlist;
+
+    foreach my $pr (@processlist) {
+      my @nbset = $pr->{cidr}->split($args{newmask});
+
+      # set up update of existing block
+      $dbh->do("UPDATE allocations SET cidr = ? WHERE id = ?", undef, ("$nbset[0]", $pr->{id}) );
+
+      # axe the new bcast IP from the smaller pool at the "base" block, if it's a "normal" pool
+      if ($pr->{type} =~ /.d/) {
+        $nbset[0]--;
+        $nbsth->execute($pr->{id}, $nbset[0]->addr);
+      }
+
+      # Holder for freeblocks-to-delete.  Should be impossible to have more than one...
+      my %fbdel;
+
+      # Loop over the new blocks that are not the base block
+      for (my $i = 1; $i <= $#nbset; $i++) {
+        # add the new allocation
+        $allocsth2->execute($nbset[$i], $pr->{id});
+
+        # fetch the ID of the entry we just added...
+        $idsth->execute();
+        my ($nid) = $idsth->fetchrow_array();
+        # ... so we can pass back the list of blocks and IDs...
+        push @ret, {nid => $nid, nblock => "$nbset[$i]"};
+        # axe the net, gw, and bcast IPs as necessary when splitting a "normal" pool
+        if ($pr->{type} =~ /.d/) {
+          # net
+          $nbsth->execute($pr->{id}, $nbset[$i]->addr);
+          $nbset[$i]++;
+          # gw
+          $nbsth->execute($pr->{id}, $nbset[$i]->addr);
+          $nbset[$i]--;
+          $nbset[$i]--;
+          # bcast
+          $nbsth->execute($pr->{id}, $nbset[$i]->addr);
+          $nbset[$i]++;
+        } # $binfo->{type} =~ /.d/
+
+        # Check for free blocks larger than the new mask length, and split those as needed.
+        if ($pr->{type} =~ /.[cm]/) {
+          # get a "list" of freeblocks bigger than the allocation in the parent.  there's only one, right?
+          my $fblist = $dbh->selectall_arrayref("SELECT id FROM freeblocks WHERE cidr >> ? AND parent_id = ? ", 
+            {Slice=>{}}, $nbset[$i], $pr->{id});
+          if (@$fblist) {
+            # create a new freeblock for the new block we created earlier
+            $dbh->do(q{
+                INSERT INTO freeblocks (cidr, parent_id, master_id, city, routed,vrf)
+                    SELECT ? AS cidr, ? AS parent_id, master_id, city, routed, vrf FROM freeblocks
+                    WHERE id = ?
+                }, undef, ($nbset[$i], $nid, $fblist->[0]->{id}) );
+            $fbdel{$fblist->[0]->{id}}++;
+          }
+        } # $binfo->{type} =~ /.[cm]/
+
+        # Reparent allocations, freeblocks, and pool IPs.  
+        $upd_psth->execute($nid, $pr->{id}, $nbset[$i]);
+        $fb_psth->execute($nid, $pr->{id}, $nbset[$i]);
+        $pool_psth->execute($nid, $pr->{id}, $nbset[$i]);
+
+        # Update master if we've split a master block
+        if ($pr->{type} eq 'mm') {
+          $upd_msth->execute($nid, $pr->{id}, $nbset[$i]);
+          $fb_msth->execute($nid, $pr->{id}, $nbset[$i]);
+          $pool_msth->execute($nid, $pr->{id}, $nbset[$i]);
         }
-      } # $binfo->{type} =~ /.[cm]/
-
-      # Reparent allocations, freeblocks, and pool IPs.  
-      $upd_psth->execute($nid, $args{id}, $newblocks[$i]);
-      $fb_psth->execute($nid, $args{id}, $newblocks[$i]);
-      $pool_psth->execute($nid, $args{id}, $newblocks[$i]);
-
-      # Update master if we've split a master block
-      if ($binfo->{type} eq 'mm') {
-        $upd_msth->execute($nid, $args{id}, $newblocks[$i]);
-        $fb_msth->execute($nid, $args{id}, $newblocks[$i]);
-        $pool_msth->execute($nid, $args{id}, $newblocks[$i]);
-      }
 
 ##fixme:
+# 2015/09/09 not sure if the latest rewrite has covered this case complete or not
 # Still missing one edge case - megasplitting a large block such that "many" children also need to be split.
 # I'm going to call this "unsupported" because I really can't imagine a sane reason for doing this.
 # Should probably check and error out at least
 
-    } # for (... @newblocks)
-
-    $dbh->do("DELETE FROM freeblocks WHERE id IN (".join(',', keys %fbdel).")") if %fbdel;
+      } # for (... @nbset)
+
+      if (%fbdel) {
+        my $delfblist = $dbh->selectall_arrayref(q{
+            SELECT cidr,parent_id,id FROM freeblocks
+            WHERE id in (
+            }.join(',', keys %fbdel).")", {Slice=>{}} );
+        $dbh->do("DELETE FROM freeblocks WHERE id IN (".join(',', keys %fbdel).")") if %fbdel;
+      }
+
+    } # foreach @processlist
 
     $dbh->commit;