Changeset 10007 for trunk


Ignore:
Timestamp:
10/06/10 17:18:49 (14 years ago)
Author:
Daniela Dorner
Message:
implemented fAvailable and fProcessingSiteKEY to allow for processing in
different sites
Location:
trunk/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/Changelog

    r10006 r10007  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2010/10/06 Daniela Dorner
     22
     23   * datacenter/scripts/sourcefile:
     24     - updated status queries to implemented new DB columns fAvailable
     25       and fProcessingSiteKEY for the status tables to allow for storing
     26       the information where the process is/was running and whether it
     27       is already available in the main data center, i.e. whether it has
     28       been already copied
     29       This ensures that the next step is only started when the job is
     30       done AND the file is available
     31
     32   * datacenter/scripts/setup.wue.fact.mc,
     33     datacenter/scripts/setup.phido.fact.mc:
     34     - implemented variables for the processing and main data center
     35       site
     36
     37
    2038
    2139 2010/10/05 Daniela Dorner

  • trunk/Mars/datacenter/scripts/setup.phido.fact.mc

    r10004 r10007  
    3636   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib
    3737fi
     38
     39# site
     40processingsite=phido
     41sitekey=2
     42storagesite=wue
    3843
    3944# queuing system

  • trunk/Mars/datacenter/scripts/setup.wue.fact.mc

    r9618 r10007  
    3636   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib
    3737fi
     38
     39# site
     40processingsite=wue
     41sitekey=1
     42storagesite=wue
    3843
    3944# queuing system
    … …  
    8388sleeptimelimit=360 #360
    8489errorsleeptimedefault=60 #60
    85 max=30 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
    86 totalmax=40 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
     90max=20 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
     91totalmax=32 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
    8792
    8893#
    … …  
    98103pnototalwe=(     32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
    99104
    100 pnocorsika=(     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    101 pnoceres=(       20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     105pnocorsika=(     10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
     106pnoceres=(       25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
    102107pnocallisto=(    32 32 32 32 32 30 30 18 18 20 20 20 20 20 20 20 20 20 20 18 18 30 30 32 )
    103 pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
     108pnostar=(        20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
    104109
    105 pnocorsikawe=(   30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    106 pnocereswe=(     20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     110pnocorsikawe=(   10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
     111pnocereswe=(     25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
    107112pnocallistowe=(  32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
    108 pnostarwe=(      10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
     113pnostarwe=(      20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
    109114
    110115# set variables for jobmanager
    111 scripts=( "runcorsika" "runceres" "runcallisto_mc" "runstar_mc" )
    112 scriptscolname=( "Corsika" "Ceres" "Callisto" "Star" )
    113 pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} )
    114 pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} )
     116#scripts=( "runcorsika" "runceres" "runcallisto_mc" "runstar_mc" )
     117#scriptscolname=( "Corsika" "Ceres" "Callisto" "Star" )
     118#pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} )
     119#pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} )
    115120
     121scripts=( "runceres" "runcallisto_mc" "runstar_mc" )
     122scriptscolname=( "Ceres" "Callisto" "Star" )
     123pnosweek=( ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} )
     124pnoswe=( ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} )
     125

  • trunk/Mars/datacenter/scripts/sourcefile

    r10004 r10007  
    169169   echo " starttime=$starttime"
    170170   echo " stoptime=$stoptime"
     171   echo " availtime=$availtime"
    171172   echo " returncode=$returncode"
    172173   echo "-- check: -$check-"
    … …  
    243244   query=$query" ISNULL("$step"Status.fStartTime) "
    244245   query=$query" AND ISNULL("$step"Status.fStopTime) "
     246   query=$query" AND ISNULL("$step"Status.fAvailable) "
    245247   query=$query" AND ISNULL("$step"Status.fReturnCode) "
    246248   # add requirement for production host in case it is needed
    … …  
    265267      query=$query" NOT ISNULL("${needs[$k]}"Status.fStartTime) "
    266268      query=$query" AND NOT ISNULL("${needs[$k]}"Status.fStopTime) "
     269      query=$query" AND NOT ISNULL("${needs[$k]}"Status.fAvailable) "
    267270      query=$query" AND ISNULL("${needs[$k]}"Status.fReturnCode) "
    268271      query=$query" , 1, NULL)) "
    … …  
    344347   starttime=NULL
    345348   stoptime=NULL
     349   availtime=NULL
    346350   returncode=NULL
    347351   # evaluate the status values
    … …  
    354358                       starttime=noreset
    355359                       stoptime="Now()"
     360                       if [ "$processingsite" = "$storagesite" ]
     361                       then
     362                          availtime="Now()"
     363                       fi
    356364                       ;;
    357365                  no)  printprocesslog "DEBUG setstatus stop - nothing new"
    … …  
    361369                       starttime=noreset
    362370                       stoptime="Now()"
     371                       if [ "$processingsite" = "$storagesite" ]
     372                       then
     373                          availtime="Now()"
     374                       fi
    363375                       if [ "$check" == "" ]
    364376                       then
    … …  
    391403      query=$query" "$step"Status.fStartTime=$starttime, "
    392404   fi
    393    query=$query" "$step"Status.fStopTime=$stoptime, "$step"Status.fReturnCode=$returncode "
     405   query=$query" "$step"Status.fStopTime=$stoptime, "$step"Status.fAvailable=$availtime"
     406   query=$query", "$step"Status.fReturnCode=$returncode , "$step"Status.fProcessingSiteKEY=$sitekey "
    394407   # set also the status values of the influenced steps
    395408   for otherstep in $othersteps
    … …  
    397410      query=$query", "$otherstep"Status.fStartTime=NULL "
    398411      query=$query", "$otherstep"Status.fStopTime=NULL "
     412      query=$query", "$otherstep"Status.fAvailable=NULL "
    399413      query=$query", "$otherstep"Status.fReturnCode=NULL "
     414      query=$query", "$otherstep"Status.fProcessingSiteKEY=NULL "
    400415   done
    401416   # give the condition for which step the status values have to be set
Note: See TracChangeset for help on using the changeset viewer.