Changeset 9604


Ignore:
Timestamp:
Jun 30, 2010, 4:53:17 PM (10 years ago)
Author:
dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9602 r9604  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2010/06/30 Daniela Dorner
     22
     23   * datacenter/db/mcinfo.php:
     24     - added output to step column in case job is running
     25     - fixed typo
     26
     27   * datacenter/scripts/runcorsika:
     28     - small bugfix (new version of 'cut' gives error for '-c 0-4')
     29
     30   * datacenter/scripts/runceres:
     31     - added (script to run telescope simulation of file basis)
     32
     33   * datacenter/scripts/setup.wue.magic.data,
     34     datacenter/scripts/setup.wue.magic.mc,
     35     datacenter/scripts/setup.wue.fact.mc:
     36     - added condorpath
     37
     38   * datacenter/scripts/jobmanager,
     39     datacenter/scripts/scriptlauncher:
     40     - implemented condorpath
     41
     42   * datacenter/scripts/sourcefile:
     43     - changed log and error file name for jobmanager
     44
     45   * resources/steps_fact.rc:
     46     - fixed typo
     47
     48
     49
    2150 2010/06/29 Daniela Dorner
    2251
     
    116145
    117146 2010/06/24 Daniela Dorner
    118 
    119    * datacenter/scripts/runceres:
    120      - added (script to run telescope simulation of file basis)
    121147
    122148   * datacenter/scripts/sourcefile, resources/steps_fact.rc:
  • trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

    r9585 r9604  
    6060            ;;
    6161   condor)  echo " on queuing system 'condor'" >> $jmscriptlog 2>&1
    62             alias 'queuesubmit'='/usr/local/bin/condor_submit -a path=`echo $scriptspath` -a prog=`echo ${scripts[$i]}` -a date=`echo $date` -a dir=`echo $runlogpath` -a automationsetup=$AUTOMATIONSETUP `echo $scriptspath`/run.condor'
    63             alias 'checkqueue'='/usr/local/bin/condor_q -global -format "Owner%s " Owner -format "%s" CMD -format "Jobstatus%s\n" Jobstatus '
     62            alias 'queuesubmit'='$condorpath/condor_submit -a path=`echo $scriptspath` -a prog=`echo ${scripts[$i]}` -a date=`echo $date` -a dir=`echo $runlogpath` -a automationsetup=$AUTOMATIONSETUP `echo $scriptspath`/run.condor'
     63            alias 'checkqueue'='$condorpath/condor_q -global -format "Owner%s " Owner -format "%s" CMD -format "Jobstatus%s\n" Jobstatus '
    6464            break
    6565            ;;
  • trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher

    r9539 r9604  
    7575   fi
    7676   echo " launching $1..." >> $scriptlog 2>&1
    77    echo "/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args=\"$arguments\" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
    78    pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args="$arguments" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
     77   echo "$condorpath/condor_submit -a path=$path -a prog=$prog -a args=\"$arguments\" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
     78   pid=`$condorpath/condor_submit -a path=$path -a prog=$prog -a args="$arguments" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
    7979   if [ "$pid" = "" ]
    8080   then
     
    8888   then
    8989      echo "  waiting for $1 to be done..." >> $scriptlog 2>&1
    90       /usr/local/bin/condor_wait $runlogpath/condor-$date.log $pid >/dev/null 2>$errorlog
     90      $condorpath/condor_wait $runlogpath/condor-$date.log $pid >/dev/null 2>$errorlog
    9191   fi
    9292   shift
  • trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc

    r9593 r9604  
    3939# queuing system
    4040queuesys=condor # wuerzburg data center
     41condorpath=/usr/local/bin
    4142
    4243# logging and setup
     
    8283sleeptimelimit=360 #360
    8384errorsleeptimedefault=60 #60
    84 max=42 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
     85max=30 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
    8586totalmax=40 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
    8687
     
    9798pnototalwe=(     42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
    9899
    99 pnocorsika=(     20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     100pnocorsika=(     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    100101pnoceres=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    101102pnocprun=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    102 pnocallisto=(    32 32 32 32 32 20 20 18 18 15 15 15 15 15 15 15 15 15 15 18 18 20 20 32 )
     103pnocallisto=(    32 32 32 32 32 30 30 18 18 15 15 15 15 15 15 15 15 15 15 18 18 30 30 32 )
    103104pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
    104105
    105 pnocorsikawe=(   20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     106pnocorsikawe=(   30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    106107pnocereswe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    107108pnocprunwe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
  • trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.data

    r9489 r9604  
    3939# queuing system
    4040queuesys=condor # wuerzburg data center
     41condorpath=/usr/local/bin
    4142
    4243# logging and setup
  • trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.mc

    r9489 r9604  
    3939# queuing system
    4040queuesys=condor # wuerzburg data center
     41condorpath=/usr/local/bin
    4142
    4243# logging and setup
  • trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

    r9593 r9604  
    162162#   log files (can't be defined in script itself, as script can run longer
    163163#   than one day
    164 jmerrorlog=$runlogpath/jobmanager-error`date +%F`.log
    165 jmscriptlog=$runlogpath/jobmanager`date +%F`.log
     164jmerrorlog=$runlogpath/jobmanager-`whoami`-$HOSTNAME-$AUTOMATIONSETUP-`date +%F`-error.log
     165jmscriptlog=$runlogpath/jobmanager-`whoami`-$HOSTNAME-$AUTOMATIONSETUP-`date +%F`.log
    166166
    167167# check if rc-files are available
  • trunk/MagicSoft/Mars/resources/steps_fact.rc

    r9593 r9604  
    1010
    1111SequenceFile.Primaries: fSequenceNumber
    12 SequenceFile.Join: LEFT JOIN SequenceFile USING(fSequenceNumber)
     12SequenceFile.Join: LEFT JOIN SequenceFileStatus USING(fSequenceNumber)
    1313
    1414Callisto.Primaries: fSequenceNumber, fCeresSetupKEY
Note: See TracChangeset for help on using the changeset viewer.