Changeset 13130 for trunk/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

May 2, 2007, 10:14:46 AM (19 years ago)

Author:

jhoblitt

Message:

add volume.allocate field and logic to use it

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (5 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.29 2007-05-02 01:00:10 jhoblitt Exp $
+# $Id: Server.pm,v 1.30 2007-05-02 20:14:45 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -166 +166 @@
         {
             # get object ID
-            my $query = $db->prepare( $sql->last_insert_id );
+            my $query = $db->prepare_cached( $sql->last_insert_id );
             $query->execute;
             ($object_id) = $query->fetchrow_array;
+            # XXX finish seems to be required when using LAST_INSERT_ID() or we
+            # get a warning about the stmt handling still be active the next
+            # time LAST_INSERT_ID() is invoked
+            $query->finish;
         }
 
@@ -185 +189 @@
         {
             # get instance ID
-            my $query = $db->prepare( $sql->last_insert_id );
+            my $query = $db->prepare_cached( $sql->last_insert_id );
             $query->execute;
             ($ins_id) = $query->fetchrow_array;
+            # XXX finish seems to be required when using LAST_INSERT_ID() or we
+            # get a warning about the stmt handling still be active the next
+            # time LAST_INSERT_ID() is invoked
+            $query->finish;
         }
     };
@@ -322 +330 @@
 
         {
-            my $query = $db->prepare( $sql->last_insert_id );
+            my $query = $db->prepare_cached( $sql->last_insert_id );
             $query->execute();
-
             ($ins_id) = $query->fetchrow_array;
+            # XXX finish seems to be required when using LAST_INSERT_ID() or we
+            # get a warning about the stmt handling still be active the next
+            # time LAST_INSERT_ID() is invoked
+            $query->finish;
         }
     };
@@ -1041 +1052 @@
             $query = $db->prepare_cached( $sql->get_storage_volume_byname );
             $rows = $query->execute(0.95, $name);
+            unless ($rows > 0) {
+                $query->finish;
+                $log->logdie("storage volume: $name is not available");
+            }
+            # when matching by name we shouldn't ever match more than once
+            if ($rows > 1) {
+                $query->finish;
+                $log->logdie("affected row count is $rows instead of 1");
+            }
         } else {
             $query = $db->prepare_cached( $sql->get_storage_volume );
             $rows = $query->execute(0.95);
-        }
-
-        # there has to be atleast one storage volume
-        unless ($rows > 0) {
-            $log->logdie( "affected row count is $rows instead of > 0" );
+            # there has to be atleast one storage volume
+            unless ($rows > 0) {
+                $query->finish;
+                $log->logdie("no storage volume is available");
+            }
         }