Changeset 30679

Timestamp:

Feb 17, 2011, 3:23:47 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

File:

• branches/eam_branches/ipp-20110213/Nebulous-Server/bin/neb-admin (modified) (2 diffs)

branches/eam_branches/ipp-20110213/Nebulous-Server/bin/neb-admin

@@ -312 +312 @@
       SELECT mountedvol.vol_id,mountedvol.name,mountedvol.available,mountedvol.allocate,total,used,
              (used / total) AS D,total * ((used / total) - $average ) AS R,  -- average
+             (used / total) - $average AS delta,
              cab_id FROM
       mountedvol JOIN volume USING(vol_id)
       WHERE mountedvol.available = 1
-      ORDER BY R DESC LIMIT $balance_N_sources                                            -- N
+      ORDER BY delta DESC LIMIT $balance_N_sources                                            -- N
       ) AS ranked_sources
       -- Z End
@@ -337 +338 @@
    SELECT mountedvol.vol_id,mountedvol.name,mountedvol.host,mountedvol.available,mountedvol.allocate,total,used,
           (used / total) AS D,total * ((used / total) - $average ) AS R,  -- average
+          (used / total) - $average AS delta,
           cab_id FROM
    mountedvol JOIN volume USING(vol_id)
    WHERE mountedvol.available = 1 AND mountedvol.allocate = 1
-   ORDER BY R ASC LIMIT $balance_M_destinations                                               -- M
+   ORDER BY delta ASC LIMIT $balance_M_destinations                                               -- M
   ) AS ranked_destinations
   -- Z2 End