Changeset 7918 for trunk

Timestamp:

08/22/06 23:03:41 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/scripts

Files:

• jobmanager (modified) (3 diffs)
• scriptlauncher (modified) (1 diff)
• setup (modified) (1 diff)

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -38 +38 @@
    for (( i=0 ; i < ${#scripts[@]} ; i++ ))
    do 
-      date  >> $scriptlog 2>&1
-      echo "sleeping $sleeptime..." >> $scriptlog 2>&1
+      makedir $jmlogpath
+      date  >> $jmscriptlog 2>&1
+      echo "sleeping $sleeptime..." >> $jmscriptlog 2>&1
       sleep $sleeptime
       dayofweek=`date +%u`
       hour=`date +%k`
       source `dirname $0`/sourcefile
-      echo "script: ${scripts[$i]}" >> $scriptlog 2>&1
-#      echo " day: $dayofweek hour: $hour" >> $scriptlog 2>&1
+      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=`setzero $queued`
@@ -59 +60 @@
       num=`echo "((( $i + 1 ) * 24 ) + ( $hour + 1 ) ) - 24 - 1 " | bc `
       pnoscript=${pnos[$num]}
-      echo " found $queued jobs in the queue (incl. running jobs) [allowed $pnototal]" >> $scriptlog 2>&1
-      echo " found $queuedscript ${scripts[$i]} in the queue (incl. running jobs) [allowed $pnoscript]" >> $scriptlog 2>&1
-#      echo "  => num=$num => pnoscript=$pnoscript (i.e. $pnoscript ${scripts[$i]} allowed)" >> $scriptlog 2>&1
+      echo " found $queued jobs in the queue (incl. running jobs) [allowed $pnototal]" >> $jmscriptlog 2>&1
+      echo " found $queuedscript ${scripts[$i]} in the queue (incl. running jobs) [allowed $pnoscript]" >> $jmscriptlog 2>&1
+#      echo "  => num=$num => pnoscript=$pnoscript (i.e. $pnoscript ${scripts[$i]} allowed)" >> $jmscriptlog 2>&1
       
       if [ "$queued" -gt "$pnototal" ]
@@ -75 +76 @@
       # get todofile
       lockfile=$lockpath/lock-getting-${script[$i]}-list.txt
-      checklock  >> $scriptlog 2>&1
+      checklock  >> $jmscriptlog 2>&1
       singleprocess="yes"
       gettodo 
-      rm -v $lockfile >> $scriptlog 2>&1
+      rm -v $lockfile >> $jmscriptlog 2>&1
 
       date=`date +%Y/%m/%d`
       date2=`date +%Y-%m-%d`
       condordir=$logpath/condor/$date
-      makedir $condordir >> $scriptlog 2>&1
+      makedir $condordir >> $jmscriptlog 2>&1
       
-      if ! /usr/local/bin/condor_submit -a path=$scriptspath -a prog=${scripts[$i]} -a date=$date2 -a dir=$condordir $scriptspath/run.condor 2>$errorlog
+      if ! /usr/local/bin/condor_submit -a path=$scriptspath -a prog=${scripts[$i]} -a date=$date2 -a dir=$condordir $scriptspath/run.condor 2>$jmerrorlog
       then 
-         date >> $errorlog
-         nail -s 'condor problem'  $erradrs < $errorlog
-         echo "condor is not working -> sleeping $errorsleeptime" >> $scriptlog 2>&1
+         date >> $jmerrorlog
+         nail -s 'condor problem'  $erradrs < $jmerrorlog
+         echo "condor is not working -> sleeping $errorsleeptime" >> $jmscriptlog 2>&1
          sleep $errorsleeptime
       fi
-      echo "" >> $scriptlog 2>&1
+      echo "" >> $jmscriptlog 2>&1
    done
 done

trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher

@@ -30 +30 @@
 source `dirname $0`/sourcefile
 
-errorlog=$logpath/scriptlauncher/`date +%Y/%m`/error`date +%F`.log
-scriptslog=$logpath/scriptlauncher/`date +%Y/%m`/jobmanager`date +%F`.log
+sllogpath=$logpath/scriptlauncher/`date +%Y/%m`
+makedir $sllogpath
+errorlog=$sllogpath/error`date +%F`.log
+scriptslog=$logpath/scriptlauncher`date +%F`.log
 
 date  >> $scriptlog 2>&1

trunk/MagicSoft/Mars/datacenter/scripts/setup

@@ -57 +57 @@
 #log files (can't be defined in script itself, as script can run longer 
 #than one day
-errorlog=$logpath/jobmanager/`date +%Y/%m`/error`date +%F`.log
-scriptslog=$logpath/jobmanager/`date +%Y/%m`/jobmanager`date +%F`.log
+jmlogpath=$logpath/jobmanager/`date +%Y/%m`
+jmerrorlog=$jmlogpath/error`date +%F`.log
+jmscriptslog=$jmlogpath/jobmanager`date +%F`.log
 
 scripts=( "runcallisto" "runstar" "runganymed" "dodatacheck" )