Changeset 10014 for trunk/Mars/datacenter

Timestamp:

10/18/10 17:17:08 (14 years ago)

Author:

Daniela Dorner

Message:

 

File:

• trunk/Mars/datacenter/scripts/jobmanager (modified) (4 diffs)

trunk/Mars/datacenter/scripts/jobmanager

@@ -47 +47 @@
 echo -n `date +%F\ %T`" starting jobmanager for setup "$AUTOMATIONSETUP >> $jmscriptlog 2>&1
 
+user=`whoami`
+
 # choose commands according to queueing system (defined in setup)
 case $queuesys in
@@ -61 +63 @@
       pbs)  echo " on queuing system 'pbs'" >> $jmscriptlog 2>&1
             alias 'queuesubmit'='$pbspath/qsub -l walltime=$walltime -l pmem=$pmem -v AUTOMATIONSETUP=$AUTOMATIONSETUP,SOURCEFILEPATH=$SOURCEFILEPATH -e `echo $runlogpath`/error-`echo $date`.log -o `echo $runlogpath`/log-`echo $date`.log `echo $noderequirementsub` `echo $scriptspath`/`echo ${scripts[$i]}` '
-            alias 'checkqueue'="$pbspath/qstat -a | awk ' { print \"Owner\"\$2\" \" \$4\"Jobstatus\"\$10 } '"
+            # check queue (restricted to current user only)
+            alias 'checkqueue'="$pbspath/qstat -a -u $user | awk ' { print \"Owner\"\$2\" \" \$4\"Jobstatus\"\$10 } '"
             break
             ;;
@@ -77 +80 @@
 
 prev=$max
-user=`whoami`
 currentnode=$minnode
 numevaluated=0
@@ -177 +179 @@
       q1=( `echo ${q[@]} | egrep -o "Owner$user"`)
       queued=${#q1[@]}
-      # get scripts in queue
+      # get number of scripts in queue
       q2=( `echo ${q[@]} | egrep -o "${scripts[$i]}"`)
       queuedscript=${#q2[@]}