Changeset 31644 for trunk

Timestamp:

Jun 16, 2011, 6:18:17 PM (15 years ago)

Author:

watersc1

Message:

update to possibly run diskbalance more efficiently.

Location:

trunk

Files:

• Nebulous-Server/bin/neb-admin (modified) (4 diffs)
• ippTasks/diskbalance.pro (modified) (4 diffs)

trunk/Nebulous-Server/bin/neb-admin

@@ -26 +26 @@
     $so_id_range,
     $limit,
+    $offset,
     $pending,
     $balance,
@@ -38 +39 @@
 $dbuser = $ENV{'NEB_USER'};
 $dbpass = $ENV{'NEB_PASS'};
+
+$offset = 0;
 
 GetOptions(
@@ -52 +55 @@
     'so_id_range=i'         => \$so_id_range,
     'limit|l=i'             => \$limit,
+    'offset=i'              => \$offset,
     'verbose|v'             => \$verbose,
 ) || pod2usage( 2 );
@@ -355 +359 @@
 GROUP BY so_id
     LIMIT $limit                                               -- limit
+    OFFSET $offset                                             -- offset
 
 "    );

trunk/ippTasks/diskbalance.pro

@@ -93 +93 @@
 $BALANCE_SO_ID_START = int($BALANCE_BIG_SO_ID * rnd(0)) 
 $BALANCE_SO_ID_RANGE = 500000
-
+$BALANCE_LIMIT       = 500
+$BALANCE_OFFSET      = 0
 # Select Nebulous objects which should be shuffled
 task           balance.load
   host         local
 
-  periods      -poll 0.5
-  periods      -exec 5
+  periods      -poll 60
+  periods      -exec 60
   periods      -timeout 1500
   npending     1
@@ -117 +118 @@
     book getword balanceControl control mDestinations -var BALANCE_M
 
-    command neb-admin --host $NEB_HOST --db $NEB_DB --user $NEB_USER --pass $NEB_PASS --pendingbalance --limit 500 --so_id_start $BALANCE_SO_ID_START --so_id_range $BALANCE_SO_ID_RANGE  --balancesources $BALANCE_N --balancedestination $BALANCE_M
+    command neb-admin --host $NEB_HOST --db $NEB_DB --user $NEB_USER --pass $NEB_PASS --pendingbalance --limit $BALANCE_LIMIT --offset $BALANCE_OFFSET --so_id_start $BALANCE_SO_ID_START --so_id_range $BALANCE_SO_ID_RANGE  --balancesources $BALANCE_N --balancedestination $BALANCE_M
 
   end
@@ -125 +126 @@
     # advance the so_id counter
     $BALANCE_SO_ID_START = $BALANCE_SO_ID_START + $BALANCE_SO_ID_RANGE
-
+    $BALANCE_OFFSET = 0
     # convert 'stdout' to book format
     ipptool2book stdout balancePending -key key -uniq -setword pantaskState INIT
@@ -141 +142 @@
     # convert 'stdout' to book format
     ipptool2book stdout balancePending -key key -uniq -setword pantaskState INIT
-
+    $BALANCE_OFFSET = $BALANCE_OFFSET + $BALANCE_LIMIT
     if ($VERBOSE > 2)
       book listbook balancePending