Changeset 8115 for trunk

Timestamp:

10/18/06 11:12:15 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/jobmanager (modified) (4 diffs)
• datacenter/scripts/sourcefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/10/18 Daniela Dorner
+
+   * datacenter/scripts/sourcefile:
+     - added makedir for lockpath and listpath
+
+   * datacenter/scripts/jobmanager:
+     - removed makedir for lockpath and listpath
+     - bugfix (continue if condor_q gives an error)
+     - reduced number of condor_q calls per loop from 3 to 1 
+     - combined two if-clauses
+     - added comments
+
+
+
  2006/10/17 Thomas Bretz
 

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -36 +36 @@
 echo "" >> $jmscriptlog 2>&1
 echo "starting jobmanager ("`date`")" >> $jmscriptlog 2>&1
-makedir $jmlogpath
-makedir $listpath >> $jmscriptlog 2>&1
-makedir $lockpath >> $jmscriptlog 2>&1
 
 prev=$max
@@ -47 +44 @@
    for (( i=0 ; i < ${#scripts[@]} ; i++ ))
    do 
-      makedir $jmlogpath
       date  >> $jmscriptlog 2>&1
+      source `dirname $0`/sourcefile
+      echo "script: ${scripts[$i]}" >> $jmscriptlog 2>&1
+
+      # check if there's something to do
+      getstatus >> $jmscriptlog 2>&1
+      echo " $numproc ${scripts[$i]} still do to" >> $jmscriptlog 2>&1
+      if [ "$numproc" = "" ]
+      then 
+         prev=0
+         cont >> $jmscriptlog 2>&1
+      fi
+      prev=$max
+
       echo "sleeping $sleeptime..." >> $jmscriptlog 2>&1
       sleep $sleeptime
-      dayofweek=`date +%u`
-      hour=`date +%k`
 
-      source `dirname $0`/sourcefile
-      echo "script: ${scripts[$i]}" >> $jmscriptlog 2>&1
-#      echo " day: $dayofweek hour: $hour" >> $jmscriptlog 2>&1
-
-      queued=`/usr/local/bin/condor_q -global -format "%s\n" Owner | grep -c $user` && ! [ $queued -eq 0 ]
-      if [ "$queued" = "" ]
+      q=(`/usr/local/bin/condor_q -global -format "Owner%s " Owner -format "%s" CMD -format "Jobstatus%s\n" Jobstatus`)
+      if echo $q | egrep \(Error\|failed\)
       then 
          printprocesslog "WARN condor_q failed"
@@ -65 +68 @@
          cont >> $jmscriptlog 2>&1
       fi
-      queuedscript=`/usr/local/bin/condor_q -global | grep $user | grep -c ${scripts[$i]}`
-      if [ "$queuedscript" = "" ]
-      then 
-         printprocesslog "WARN condor_q failed"
-         echo `date`"ERROR condor_q failed" >> $jmerrorlog
-         cont >> $jmscriptlog 2>&1
-      fi
-      runningscript=`/usr/local/bin/condor_q -global | grep $user | grep ' R ' | grep -c ${scripts[$i]}`
-      if [ "$runningscript" = "" ]
-      then 
-         printprocesslog "WARN condor_q failed"
-         echo `date`"ERROR condor_q failed" >> $jmerrorlog
-         cont >> $jmscriptlog 2>&1
-      fi
+      q1=(`echo ${q[@]} | egrep -o Owner$user`)
+      queued=${#q1[@]}
+      
+      q2=(`echo ${q[@]} | egrep -o ${scripts[$i]}`)
+      queuedscript=${#q2[@]}
+      
+      q3=(`echo ${q[@]} | egrep -o ${scripts[$i]}Jobstatus2`)
+      runningscript=${#q3[@]}
       stillinqueue=`echo $queuedscript - $runningscript | bc `
 
+      #get total number of allowed process for current time
+      hour=`date +%k`
       totalpno=${pnototal[$hour]}
       
       #choose array according to the day of the week
+      dayofweek=`date +%u`
       case $dayofweek in
          0 | 6)  pnos=( ${pnoswe[@]} ) ;;
@@ -98 +98 @@
       echo " found $queuedscript ${scripts[$i]} in the queue (incl. running jobs [$runningscript]) [allowed $pnoscript] - not running: $stillinqueue" >> $jmscriptlog 2>&1
       
-      if [ "$queued" -gt "$totalpno" ]
-      then
-         cont >> $jmscriptlog 2>&1
-      fi
-      if [ "$queuedscript" -gt "$pnoscript" ]
+      if [ "$queued" -gt "$totalpno" ] || [ "$queuedscript" -gt "$pnoscript" ]
       then
          cont >> $jmscriptlog 2>&1
       fi
 
-      # check if there's something to do
-      getstatus >> $jmscriptlog 2>&1
-      echo " $numproc ${scripts[$i]} still do to" >> $jmscriptlog 2>&1
-      if [ "$numproc" = "" ]
-      then 
-         prev=0
-         cont >> $jmscriptlog 2>&1
-      fi
-      prev=$max
       if [ $numproc -lt $stillinqueue ]
       then 

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -66 +66 @@
 processlog=$processlogpath/process`date +%F`.log
 
+makedir $lockpath
+makedir $listpath
 
 # set checkvalue to ok at the beginning of the scripts