Changeset 10004 for trunk/Mars

Timestamp:

10/05/10 10:27:40 (14 years ago)

Author:

Daniela Dorner

Message:

implemented usage of cluster in Dortmund (phido), i.e. usage of pbs

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/jobmanager (modified) (5 diffs)
• datacenter/scripts/runcorsika (modified) (1 diff)
• datacenter/scripts/setup.phido.fact.mc (added)
• datacenter/scripts/sourcefile (modified) (1 diff)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/10/05 Daniela Dorner
+
+   * datacenter/scripts/jobmanager:
+     - implemented pbs as third queueing system: implemented variable
+       $SOURCEFILEPATH as pbs copies script locally; implemented 
+       walltime and mem
+
+   * datacenter/scripts/setup.phido.fact.mc:
+     - added (setup file for cluster in Dortmund); includes array for 
+       walltime and mem
+
+   * datacenter/scripts/runcorsika, datacenter/scripts/sourcefile:
+     - implemented variable $SOURCEFILEPATH
+
+
 
  2010/09/30 Thomas Bretz

trunk/Mars/datacenter/scripts/jobmanager

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2006 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2009
+#   Copyright: MAGIC Software Development, 2000-2010
 #
 #
@@ -26 +26 @@
 #
 # This a script, which launches other scripts (all scripts, that are run 
-# on primary basis
+# on primary basis)
 #
 
@@ -57 +57 @@
             # FIXME: get complete scriptname (including command line option), needed for runstereo
             alias 'checkqueue'="/opt/gridengine/bin/lx26-amd64/qstat \`echo \$noderequirementstat\`  | awk ' { print \"Owner\"\$4\" \" \$3\"Jobstatus\"\$5 } '"
+            break
+            ;;
+      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 } '"
             break
             ;;
@@ -90 +95 @@
       step=${scriptscolname[$i]}
       getstepinfo
+      # check if walltime has to be set
+      if [ "$setwalltime" = "yes" ]
+      then
+         walltime=${walltimes[$i]}
+      fi
+      # check if memory has to be set
+      if [ "$setpmem" = "yes" ]
+      then
+         pmem=${pmems[$i]}
+      fi
+      # check if the script is restricted to one node 
+      #   (i.e. where output of previous step(s) is stored)
+      # this information is taken from the steps.rc file
       if [ "$noderestricted" = "yes" ]
       then
@@ -163 +181 @@
       queuedscript=${#q2[@]}
       # get running scripts
-      q3=( `echo ${q[@]} | egrep -o \("${scripts[$i]}"Jobstatus2\|"${scripts[$i]}"Jobstatusr\)` )
+      #   condor: 2
+      #   sge: r
+      #   pbs: R
+      q3=( `echo ${q[@]} | egrep -o \("${scripts[$i]}"Jobstatus2\|"${scripts[$i]}"Jobstatusr\|"${scripts[$i]}"JobstatusR\)` )
       runningscript=${#q3[@]}
       stillinqueue=`echo $queuedscript - $runningscript | bc `

trunk/Mars/datacenter/scripts/runcorsika

@@ -28 +28 @@
 # 
 
-source `dirname $0`/sourcefile
+if [ "$SOURCEFILEPATH" = "" ]
+then 
+   source `dirname $0`/sourcefile
+else
+   source $SOURCEFILEPATH/sourcefile
+fi
 printprocesslog "INFO starting $0"
 program=corsika

trunk/Mars/datacenter/scripts/sourcefile

@@ -44 +44 @@
 fi
 
+if [ "$SOURCEFILEPATH" = "" ]
+then 
+   export SOURCEFILEPATH=`dirname $0`
+fi
+
 # possible solution for $0 problem: 
 # ${BASH_SOURCE[0]} 
 # but has to be checked and tested more carefully
 # should solve at least problem with login-shell and with source
-source `dirname $0`/setup.$AUTOMATIONSETUP
+source $SOURCEFILEPATH/setup.$AUTOMATIONSETUP
 
 datetime=`date +%F-%H-%M-%S`