Changeset 26294

Timestamp:

Nov 30, 2009, 4:56:31 PM (16 years ago)

Author:

watersc1

Message:

Updated the topfew_count to be 15 (from 3. 15 is roughly a quarter of the cluster).

Reworked the replication volume selection SQL to run in a reasonable timescale.

Location:

trunk/Nebulous-Server/lib/Nebulous

Files:

• Server.pm (modified) (2 diffs)
• Server/SQL.pm (modified) (1 diff)

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

@@ -40 +40 @@
 
 # This determines how many entries from the list of volumes sorted by free space are randomized.
-my $topfew_count = 3;
+my $topfew_count = 15;
 
 # transaction restart/retry regex
@@ -2130 +2130 @@
             # %free, avaiable, allocate
             $rows = $query->execute(0.95, 1, 1, $topfew_count);
+#           $log->warn("Storage_volume: $rows $topfew_count");
             # there has to be atleast one storage volume
             unless ($rows > 0) {

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

@@ -310 +310 @@
                    JOIN volume 
                    ON instance.vol_id = volume.vol_id
+                   WHERE so_id = (
+                                  SELECT so_id
+                                  FROM storage_object
+                                  WHERE ext_id = ?
+                                 )
                   ) AS i
             ON m.vol_id = i.vol_id
-            AND i.so_id = (
-                SELECT so_id
-                FROM storage_object
-                WHERE ext_id = ?
-            )
          WHERE
              i.vol_id IS NULL