Changeset 13131 for trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

May 2, 2007, 10:53:42 AM (19 years ago)

Author:

jhoblitt

Message:

add volume.available field and logic to use it

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.32 2007-05-02 20:14:46 jhoblitt Exp $
+# $Id: SQL.pm,v 1.33 2007-05-02 20:53:42 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -161 +161 @@
             used / total < ?
             AND name = ?
+            AND available = ?
+            AND allocate = ?
         ORDER BY free DESC
         LIMIT 1
@@ -172 +174 @@
         WHERE
             used / total < ?
+            AND available = ?
+            AND allocate = ?
         ORDER BY free DESC
         LIMIT 1
@@ -177 +181 @@
     new_volume          => qq{
         INSERT INTO volume (name, path, allocate)
-        VALUES (?, ?, TRUE)
+        VALUES (?, ?, TRUE, TRUE)
     },
     get_volume_by_name => qq{
@@ -304 +308 @@
     path VARCHAR(255) NOT NULL,
     allocate BOOLEAN DEFAULT FALSE,
+    available BOOLEAN DEFAULT FALSE,
     PRIMARY KEY(vol_id),
     KEY(name(16)),
-    KEY(allocate)
+    KEY(allocate),
+    KEY(available)
 ) ENGINE=innodb;
 
@@ -337 +343 @@
     DECLARE namevar VARCHAR(255);
     DECLARE pathvar VARCHAR(255);
-    DECLARE cur1 CURSOR FOR SELECT vol_id, name, path FROM volume
-        WHERE allocate = TRUE;
+    DECLARE allocatevar BOOLEAN;
+    DECLARE availablevar BOOLEAN;
+    DECLARE cur1 CURSOR FOR SELECT vol_id, name, path, allocate, available FROM volume;
     DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = TRUE;
 
@@ -353 +360 @@
         vol_id INT NOT NULL,
         name VARCHAR(255) NOT NULL,
-        path VARCHAR(255) NOT NULL
+        path VARCHAR(255) NOT NULL,
+        allocate BOOLEAN DEFAULT FALSE,
+        available BOOLEAN DEFAULT FALSE
     ) ENGINE=MEMORY;
 
@@ -363 +372 @@
 
     myloop: LOOP
-        FETCH cur1 INTO vol_idvar, namevar, pathvar;
+        FETCH cur1 INTO vol_idvar, namevar, pathvar, allocatevar, availablevar;
         IF `done` THEN LEAVE myloop; END IF;
         INSERT INTO mountedvol
-            SELECT mountpoint, total, used, vol_idvar, namevar, pathvar
+            SELECT mountpoint, total, used, vol_idvar, namevar, pathvar, allocatevar, availablevar
             FROM
                 (SELECT *, INSTR(pathvar, mountpoint) = 1 as substring