Changeset 7908 for trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

Timestamp:

08/22/06 13:05:14 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/scripts/jobmanager (modified) (5 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -30 +30 @@
 
 
-#source `dirname $0`/sourcefile (is done in jobsourcefile)
-
+source `dirname $0`/sourcefile
 user=`whoami`
-sourcefile=/home/$user/Mars.cvs/datacenter/scripts/jobsourcefile
-source $sourcefile
 
 notcount=0
@@ -46 +43 @@
       dayofweek=`date +%u`
       hour=`date +%k`
-      source $sourcefile
+      source `dirname $0`/sourcefile
       echo "script: ${scripts[$i]}" #>> $scriptlog 2>&1
-      echo " day: $dayofweek hour: $hour" #>> $scriptlog 2>&1
+#      echo " day: $dayofweek hour: $hour" #>> $scriptlog 2>&1
       queued=`/usr/local/bin/condor_q -global -format "%s\n" Owner | grep -c $user`
       queued=`setzero $queued`
-      echo " found $queued jobs in the queue (incl. running jobs)" #>> $scriptlog 2>&1
       queuedscript=`/usr/local/bin/condor_q -global | grep $user | grep -c ${scripts[$i]}`
       queuedscript=`setzero $queuedscript`
-      echo " found $queuedscript ${scripts[$i]} in the queue (incl. running jobs)" #>> $scriptlog 2>&1
 
       pnototal=${pnototal[$hour]}
@@ -64 +59 @@
       num=`echo "((( $i + 1 ) * 24 ) + ( $hour + 1 ) ) - 24 - 1 " | bc `
       pnoscript=${pnos[$num]}
-      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]" #>> $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 " queued: $queued - pnototal: $pnototal" #>> $scriptlog 2>&1
       if [ "$queued" -gt "$pnototal" ]
       then
          continue
       else
-         echo " queued ${scripts[$i]}: $queuedscript - pno: $pnoscript" #>> $scriptlog 2>&1
          if [ "$queuedscript" -gt "$pnoscript" ]
          then
@@ -77 +72 @@
          fi
       fi
-      
-      echo " gettodo..."
-      echo "getting db..."
-      db=`grep Database $mars/sql.rc | grep -v '#' | sed -e 's/Database: //' -e 's/ //g'`
-      col=${scriptscolname[$i]}
-      table=`grep "$col:" $steps | sed -e "s/[.]$col://" -e 's/#//' -e 's/ //g'`
-      coltab=`grep "$col:" $steps | sed -e 's/://' -e 's/#//' -e 's/ //g'`
-      needs=`grep "$coltab[.]Needs:" $steps | sed -e "s/$coltab[.]Needs://"`
-      influences=`grep "$coltab[.]Influences:" $steps | sed -e "s/$coltab[.]Influences://"`
-      primary=fSequenceFirst
-      echo "db: $db - col $col - table $table - coltab $coltab"
-      echo "needs: $needs"
-      echo "influences: $influences"
-      query="select $primary from $table where "
-      for need in $needs
-      do
-         query=$query" not isnull($need) and"
-      done
-      for influence in $influences
-      do 
-         query=$query" isnull($influence) and"
-      done
-      query=$query" isnull(fStartTime) and isnull(fFailedTime) and isnull(fFailedCode) and isnull(fFailedCodeAdd) and isnull(fReturnCode) order by $primary desc limit 0, 1 "
-      echo "QUERY: "$query
-      echo ""
-      echo " gettodofiles -> pno"
 
-      if [ "$pno" == "0" ]
-      then
-         echo " pno = $pno -> continue" #>> $scriptlog 2>&1
-         echo "" #>> $scriptlog 2>&1
-         continue
-      fi
+      singleprocess="yes"
+      gettodo 
 
       y=`date +%Y`
@@ -115 +80 @@
       d=`date +%d`
       condordir=$logpath/condor/$y/$m/$d
-      makedir  $condordir #>> $scriptlog 2>&1
+      makedir $condordir #>> $scriptlog 2>&1
       
-      echo "  ---> starting $pno ${scripts[$i]}..." #>> $scriptlog 2>&1
+#      echo "  ---> starting ${scripts[$i]} for $process" #>> $scriptlog 2>&1
       
       #test
-      echo ""
-      continue
+      contex
       #test
       if ! /usr/local/bin/condor_submit -a path=$scriptspath -a prog=${scripts[$i]} -a y=$y -a m=$m -a d=$d $scriptspath/run.condor 2>$errorlog