Changeset 9489 for trunk

Timestamp:

08/13/09 13:28:51 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• datacenter/scripts/jobmanager (modified) (2 diffs)
• datacenter/scripts/setup.isdc.cta (added)
• datacenter/scripts/setup.wue.magic.data (added)
• datacenter/scripts/setup.wue.magic.mc (added)
• datacenter/scripts/sourcefile (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/08/13 Daniela Dorner
+
+   * datacenter/scripts/setup.isdc.cta, 
+     datacenter/scripts/setup.wue.magic.data, 
+     datacenter/scripts/setup.wue.magic.mc:
+     - added (setup files with different default settings for usage with
+       $AUTOMATIONSETUP)
+
+   * datacenter/scripts/sourcefile:
+     - moved variables for resourcefiles steps.rc and sql.rc to setup.*
+     - removed function cont()
+     - added check if setup.* is existing
+
+   * datacenter/scripts/jobmanager:
+     - removed command line options (done now via environment variable
+       $AUTOMATIONSETUP)
+     - moved arrays $scripts, $scriptscolname, $pnosweek, $pnoswe to
+       setup.*
+
+
 
  2009/08/12 Daniela Dorner

trunk/MagicSoft/Mars/NEWS

@@ -99 +99 @@
    * new feature in showplots*.php: on mouse-over additional information
      on the sequence is displayed
+
+ ;automation:
+
+   * jobmanager can be used more flexible now: via environnent variable
+     $AUTOMATIONSETUO more than one jobmanager per user can be started
+     using the same MARS version
+     Usage: export AUTOMATIONSETUP=mysetup ; /fullpath/jobmanager
+     and provide a file Mars/datacenter/scripts/setup.mysetup
 
 

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2006 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2009
 #
 #
@@ -45 +45 @@
 echo "" >> $jmscriptlog 2>&1
 echo "" >> $jmscriptlog 2>&1
-echo -n `date +%F\ %T`" starting jobmanager for setup " >> $jmscriptlog 2>&1
-
-# decide which jobmanager you want to run
-# setup of the different jobmanagers (which scripts they start)
-#  the number of jobs are defined in the file setup
-case $1 in
-   data) echo -n "'data'" >> $jmscriptlog 2>&1
-         scripts=( "runganymed" "runstar" "runcallisto" ) # not used: "dodatacheck" "cutslices"
-         scriptscolname=( "fGanymed" "fStar" "fCallisto" ) # not used: "fDataCheckDone" "fCompmux" 
-         pnosweek=( ${pnoganymed[@]} ${pnostar[@]} ${pnocallisto[@]} ) # not used: ${pnodatacheck[@]} ${pnocutslices[@]}
-         pnoswe=( ${pnoganymedwe[@]} ${pnostarwe[@]} ${pnocallistowe[@]} ) # not used: ${pnodatacheckwe[@]} ${pnocutsliceswe[@]}
-         break
-         ;;
-     mc) echo -n "'mc'" >> $jmscriptlog 2>&1
-         scripts=( "runcorsika" "runreflector" "runcamera" )
-         scriptscolname=( "fCorsikaFileAvail" "fReflectorFileAvail" "fCameraFileAvail" )
-         pnosweek=( ${pnocorsika[@]} ${pnoreflector[@]} ${pnocamera[@]} )
-         pnoswe=( ${pnocorsikawe[@]} ${pnoreflectorwe[@]} ${pnocamerawe[@]} )
-         break
-         ;;
-  ctamc) echo -n "'cta mc'" >> $jmscriptlog 2>&1
-         scripts=( "runsimtel" )
-         scriptscolname=( "fCorsikaSimTelarray" )
-         pnosweek=( ${pnosimtel[@]} )
-         pnoswe=( ${pnosimtelwe[@]} )
-         break
-         ;;
-      *) echo ""
-         echo "'$1' is a wrong commandline option for jobmanager -> exit" >> $jmscriptlog 2>&1
-         echo "'$1' is a wrong commandline option for jobmanager -> exit" 
-         printprocesslog "WARN '$1' is a wrong commandline option for jobmanager"
-         finish >> $jmscriptlog 2>&1
-         break
-         ;;
-esac
+echo -n `date +%F\ %T`" starting jobmanager for setup "$AUTOMATIONSETUP >> $jmscriptlog 2>&1
 
 # choose commands according to queueing system (defined in setup)

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -38 +38 @@
 fi
 
-source `dirname $0`/setup 
-
-mars=`dirname $0 | sed -e 's/\/datacenter\/scripts//'`
-macrospath=$mars/datacenter/macros
-scriptspath=$mars/datacenter/scripts
+if [ "$AUTOMATIONSETUP" = "" ]
+then 
+   echo "Please set the environment variable \$AUTOMATIONSETUP."
+   exit
+fi
+
+source `dirname $0`/setup.$AUTOMATIONSETUP
 
 datetime=`date +%F-%H-%M-%S`
@@ -157 +159 @@
 jmerrorlog=$runlogpath/jobmanager-error`date +%F`.log
 jmscriptlog=$runlogpath/jobmanager`date +%F`.log
-steps=$mars/resources/steps.rc
+
+# check if rc-files are available
 if ! ls $steps >/dev/null
 then
@@ -163 +166 @@
    finish
 fi
-sqlrc=$mars/sql.rc
 if ! ls $sqlrc >/dev/null
 then
@@ -169 +171 @@
    finish
 fi
+
 # resetting values
 pno=0
@@ -186 +189 @@
 # in the following the functions, which are needed by several scripts, are 
 # defined
-
-# function to do continue in a loop and produce according logging
-function cont()
-{
-   date
-   echo ""
-   continue
-}
 
 # function to check if a process is already locked
@@ -368 +363 @@
    then
       printprocesslog "ERROR could not query number of processes from db (program: $program, function getstatus)"
-      cont
+      echo `date +%F\ %T`" ERROR could not query number of processes from db (program: $program, function getstatus)"
+      continue
    fi
 }