Changeset 13130 for trunk/Nebulous/lib

Timestamp:

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

Author:

jhoblitt

Message:

add volume.allocate field and logic to use it

Location:

trunk/Nebulous/lib/Nebulous

Files:

• Server.pm (modified) (5 diffs)
• Server/SQL.pm (modified) (4 diffs)

trunk/Nebulous/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");
+            }
         }
 

trunk/Nebulous/lib/Nebulous/Server/SQL.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.31 2007-05-02 01:00:10 jhoblitt Exp $
+# $Id: SQL.pm,v 1.32 2007-05-02 20:14:46 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -176 +176 @@
     },
     new_volume          => qq{
-        INSERT INTO volume (name, path)
-        VALUES (?, ?)
+        INSERT INTO volume (name, path, allocate)
+        VALUES (?, ?, TRUE)
     },
     get_volume_by_name => qq{
@@ -303 +303 @@
     name VARCHAR(255) UNIQUE NOT NULL,
     path VARCHAR(255) NOT NULL,
+    allocate BOOLEAN DEFAULT FALSE,
     PRIMARY KEY(vol_id),
-    KEY(name(16))
+    KEY(name(16)),
+    KEY(allocate)
 ) ENGINE=innodb;
 
@@ -335 +337 @@
     DECLARE namevar VARCHAR(255);
     DECLARE pathvar VARCHAR(255);
-    DECLARE cur1 CURSOR FOR SELECT vol_id, name, path FROM volume;
+    DECLARE cur1 CURSOR FOR SELECT vol_id, name, path FROM volume
+        WHERE allocate = TRUE;
     DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = TRUE;