Changeset 7924 for trunk/MagicSoft

Timestamp:

08/23/06 20:34:15 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/scripts

Files:

• jobmanager (modified) (5 diffs)
• sourcefile (modified) (3 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -33 +33 @@
 user=`whoami`
 
-makedir $listpath
-makedir $lockpath
+set -C
+
+makedir $listpath >> $jmscriptlog 2>&1
+makedir $lockpath >> $jmscriptlog 2>&1
 
 notcount=0
@@ -55 +57 @@
       queuedscript=`setzero $queuedscript`
 
-      pnototal=${pnototal[$hour]}
+      echo "date: "`date`" --- date +%k"`date +%k` >> $jmscriptlog 2>&1
+      echo "--- hour: $hour --- pnototal(hour): ${pnototal[$hour]} --- totalpno: $totalpno ---" >> $jmscriptlog 2>&1
+      totalpno=${pnototal[$hour]}
+      echo "--- hour: $hour --- pnototal(hour): ${pnototal[$hour]} --- totalpno: $totalpno ---" >> $jmscriptlog 2>&1
+      echo "date: "`date`" --- date +%k"`date +%k` >> $jmscriptlog 2>&1
+      
       #choose array according to the day of the week
       case $dayofweek in
@@ -63 +70 @@
       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]" >> $jmscriptlog 2>&1
+      echo " found $queued jobs in the queue (incl. running jobs) [allowed $totalpno]" >> $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" ]
+      if [ "$queued" -gt "$totalpno" ]
       then
-         continue
+         contex >> $jmscriptlog 2>&1
       else
          if [ "$queuedscript" -gt "$pnoscript" ]
          then
-            continue
+            contex >> $jmscriptlog 2>&1
          fi
       fi
@@ -81 +88 @@
       checklock  >> $jmscriptlog 2>&1
       singleprocess="yes"
-      gettodo 
+      gettodo  >> $jmscriptlog 2>&1
       rm -v $lockfile >> $jmscriptlog 2>&1
 
@@ -89 +96 @@
       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>$jmerrorlog
+      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 >> $jmerrorlog

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -314 +314 @@
    then
       echo "ERROR could not query process from db -> contex"
+      rm -v $lockfile
       contex
    fi
@@ -320 +321 @@
    then
       echo "  => nothing to do" 
+      rm -v $lockfile
       contex 
    else 
@@ -335 +337 @@
       then
          echo "$todofile exists already"
+         rm -v $lockfile
          contex 
       fi