Changeset 27517 for branches/eam_branches/20100225/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (7 diffs)

branches/eam_branches/20100225/Nebulous-Server/lib/Nebulous/Server.pm

@@ -41 +41 @@
 # This determines how many entries from the list of volumes sorted by free space are randomized.
 my $topfew_count = 15;
-
+my $max_used_space = 0.98;
 # transaction restart/retry regex
 my $trans_regex = qr/Deadlock Found|Lock wait timeout exceeded|try restarting transaction|Can't connect to MySQL server/i;
@@ -1606 +1606 @@
     $log->debug("entered - @_");
 
-    my ($key, $vol_name) = validate_pos(@_,
+    my ($key, $vol_name, $find_invalid) = validate_pos(@_,
         {
             type        => SCALAR,
@@ -1624 +1624 @@
             optional    => 1,
         },
+        {
+            # find_invalid
+            type        => SCALAR|UNDEF,
+            optional    => 1,
+        }, 
     );
 
@@ -1667 +1672 @@
         } else {
             $query = $db->prepare_cached( $sql->get_object_instances );
+            my $rows;
             # ext_id, available
-            my $rows = $query->execute($key->path, 1);
+            if (defined($find_invalid)) {
+                $rows = $query->execute($key->path, 0);
+            }
+            else {
+                $rows = $query->execute($key->path, 1);
+            }
             unless ($rows > 0) {
                 $query->finish;
@@ -2108 +2119 @@
             $query = $db->prepare_cached( $sql->get_storage_volume_by_name );
             # %free, name, avaiable, allocate
-            $rows = $query->execute(0.95, $name, 1, 1);
+            $rows = $query->execute($max_used_space, $name, 1, 1);
             # XXX destinguish between non-existant and unavailable
             unless ($rows > 0) {
@@ -2129 +2140 @@
             $query = $db->prepare_cached( $sql->get_storage_volume );
             # %free, avaiable, allocate
-            $rows = $query->execute(0.95, 1, 1, $topfew_count);
+            $rows = $query->execute($max_used_space, 1, 1, $topfew_count);
 #           $log->warn("Storage_volume: $rows $topfew_count");
             # there has to be atleast one storage volume
@@ -2201 +2212 @@
         $query = $db->prepare_cached( $sql->get_replication_volume_for_ext_id );
         # ext_id, %free, avaiable, allocate
-        $rows = $query->execute($key->path, 0.95, 1, 1, $forbidden_cabinet, $topfew_count);
+        $rows = $query->execute($key->path, $max_used_space, 1, 1, $forbidden_cabinet, $topfew_count);
         # XXX destinguish between non-existant and unaviable
         unless ($rows > 0) {