Changeset 32337 for branches/eam_branches/ipp-20110710/ippTasks/diskbalance.pro

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110710/ippTasks/diskbalance.pro (modified) (6 diffs)

branches/eam_branches/ipp-20110710/ippTasks/diskbalance.pro

@@ -75 +75 @@
   book listpage balanceControl control
   echo "balance so_ids: $BALANCE_SO_ID_START $BALANCE_SO_ID_RANGE"
+  echo "targetting:     $BALANCE_TARGET"
 end
 
@@ -81 +82 @@
   echo "$N pages in book"
   book listbook balancePending
+end
+
+macro set.balance.target
+ if ($0 != 2) 
+   echo "USAGE: set.balance.target (DESTINATION|SOURCE)"
+   break
+ end
+ $BALANCE_TARGET = $1
 end
 
@@ -95 +104 @@
 $BALANCE_LIMIT       = 500
 $BALANCE_OFFSET      = 0
+$BALANCE_TARGET      = "SOURCE"
 # Select Nebulous objects which should be shuffled
 task           balance.load
@@ -180 +190 @@
 
   task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec 5
+
     book npages balancePending -var N
     if ($NETWORK == 0) break
-    if ($N == 0)
-        periods -exec 5
-        break
-    end
-    # Reset the speed if we're doing something
-    periods -exec 0.5
+    if ($N == 0) break
 
     # look for new objects in balancePending
@@ -197 +205 @@
     book getword balancePending $pageName key              -var KEY
     book getword balancePending $pageName source_name      -var SOURCE
+    book getword balancePending $pageName source_host      -var SOURCE_HOST
     book getword balancePending $pageName destination_name -var DESTINATION
     book getword balancePending $pageName destination_host -var DEST_HOST
     # Fix this with multihost restriction when possible.
-    set.host.for.balance $DEST_HOST
+    if ("$BALANCE_TARGET" == "DESTINATION")
+       set.host.for.balance $DEST_HOST
+    else 
+       set.host.for.balance $SOURCE_HOST
+    end
+    
 
     stdout NULL
@@ -214 +228 @@
         echo command $run
     end
+    periods -exec 0.05
     command $run
   end
 
   # default exit status
-  task.exit default
+  task.exit     default
     process_exit balancePending $options:0 $JOB_STATUS
   end