Changeset 739 for trunk/cgi-bin

Timestamp:

05/29/15 18:06:09 (10 years ago)

Author:

Kris Deugau

Message:

/dev

Fix a lurking bug before I forget; splitting a largish container with
mostly free space would result in mangled free blocks. Any block larger
than the split size needs to be split as well and distributed between the
appropriate containers. See #7.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1908 +1908 @@
     }
 
+    # 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++) {
@@ -1929 +1932 @@
         $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}}++;
+        }
+      } # $binfo->{type} =~ /.[cm]/
 
       # Reparent allocations, freeblocks, and pool IPs.  
@@ -1943 +1962 @@
       }
 
+##fixme:
+# 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).")");
 
     $dbh->commit;