IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 22, 2019, 4:11:49 PM (7 years ago)
Author:
cclin33
Message:

update addstar for multiple hosts

Location:
branches/ccl_branches/ipponly-20191108/ippTasks
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro

    r40803 r41211  
    405405
    406406  ## we want only a single outstanding addstar job. 
    407   host         local
    408   npending     1
     407#  host         local
     408  npending     50
    409409
    410410  task.exec
    … …  
    433433    book getword addPendingExp $pageName image_only -var IMAGE_ONLY
    434434    book getword addPendingExp $pageName dbname -var DBNAME
    435 
     435    book getword addPendingExp $pageName dvodbhost  -var DVODBHOST
     436
     437    echo $DBNAME
     438    echo $MINIDVODB_NAME
     439    echo $DVODBHOST
     440
     441    host -required $DVODBHOST
    436442
    437443    # specify choice of remote host based on camera and chip (class_id)
    438     # set.host.for.camera $CAMERA FPA
     444    #set.host.for.camera $CAMERA FPA
    439445
    440446    # set the WORKDIR variable
    … …  
    473479    end
    474480
    475  
    476 
    477481    stdout $LOGDIR/addstar.exp.log
    478482    stderr $LOGDIR/addstar.exp.log
    479483
    480     $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
     484    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output --dvodbhost $DVODBHOST
     485
    481486    if ("$REDUCTION" != "NULL")
    482487      $run = $run --reduction $REDUCTION
    … …  
    503508    end
    504509
    505 
     510    echo $run
    506511
    507512    if ("$IMAGE_ONLY" == "T")
    … …  
    527532    end
    528533    command $run
     534    showcommand
    529535  end
    530536
    … …  
    546552    book setword addPendingExp $options:0 pantaskState TIMEOUT
    547553  end
     554
    548555end
    549556

  • branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro

    r38584 r41211  
    131131## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
    132132macro add.minidvodb
    133   if ($0 != 7)
    134     echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)"
     133  if ($0 != 8)
     134    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera) (minidvodb_host)"
    135135    break
    136136  end
    … …  
    145145  book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1
    146146  book setword MINIDVODB_PREMERGE $1 DVODB $3
    147   book setword MINIDVODB_PREMERGE $1 CAMERA $5
     147  book setword MINIDVODB_PREMERGE $1 CAMERA $6
    148148  book setword MINIDVODB_PREMERGE $1 STATE PENDING
    149149  #active 
    … …  
    161161  book setword MINIDVODB_CREATE $1 DVODB_NUM $5
    162162  book setword MINIDVODB_CREATE $1 CAMERA $6 
     163  book setword MINIDVODB_CREATE $1 MINIDVODB_HOST $7
    163164  book setword MINIDVODB_CREATE $1 STATE PENDING 
    164165end
    … …  
    180181    break
    181182  end
    182   echo "minidvodb wait"
     183  echo "minidvodb_wait"
    183184  book listbook MINIDVODB
    184   echo "minidvodb premerge"
     185  echo "minidvodb_premerge"
    185186  book listbook MINIDVODB_PREMERGE
    186187  echo "minidvodb create"
    … …  
    191192
    192193
    193 $LOADEXEC_MDB = 300
    194 
    195 
    196 
     194#$LOADEXEC_MDB = 300
     195$LOADEXEC_MDB = 2
     196$timeout_mdb  = 2
     197$LOADPOLL = 2
     198$RUNEXEC = 2
    197199
    198200
    … …  
    202204  periods      -poll $LOADPOLL
    203205  periods      -exec $LOADEXEC_MDB
    204   periods      -timeout 300
     206#  periods      -timeout 300
     207  periods      -timeout $timeout_mdb
    205208  npending     1
    206209
    … …  
    211214    book npages MINIDVODB -var N
    212215    if ($N == 0)
    213 #      echo "No labels for processing"
     216      echo "No labels for processing minidvodb.wait.load"
    214217      break
    215218    endif
    … …  
    279282  periods      -poll $RUNPOLL
    280283  periods      -exec $RUNEXEC
    281   periods      -timeout 60
     284#  periods      -timeout 60
     285  periods      -timeout $timeout_mdb
    282286
    283287  task.exec
    … …  
    511515
    512516task           minidvodb.create
    513   host         local
     517#  host         local
    514518
    515519  periods      -poll $LOADPOLL
    516520  periods      -exec $LOADEXEC_MDB
    517   periods      -timeout 240
    518   npending     1
     521#  periods      -timeout 240
     522  periods      -timeout $timeout_mdb
     523#  npending     1
    519524
    520525  stdout NULL
    … …  
    523528  task.exec
    524529   
    525  periods      -poll 60
     530# periods      -poll 60
    526531#wait a bit before trying again
    527532
    528533    book npages MINIDVODB_CREATE -var N
    529534    if ($N == 0)
    530 #      echo "No labels for processing"
     535      echo "No labels for processing on minidvodb_create"
    531536      break
    532537    endif
    … …  
    552557    book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num
    553558    book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
    554     $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num
     559    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB_HOST -var minidvodbhost
     560    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num --minidvodb_host $minidvodbhost
    555561 
    556562    if ($DB:n == 0)
    … …  
    593599
    594600task           minidvodb.active.load
    595   host         local
     601#  host         local
    596602
    597603  periods      -poll $LOADPOLL
    598604  periods      -exec $LOADEXEC_MDB
    599   periods      -timeout 30
    600   npending     1
     605#  periods      -timeout 30
     606  periods      -timeout $timeout_mdb
     607#  npending     1
    601608
    602609  stdout NULL
    … …  
    606613    book npages MINIDVODB_ACTIVE -var N
    607614    if ($N == 0)
    608 #      echo "No labels for processing"
     615      echo "No labels for processing minidvodb.active.load"
    609616      break
    610617    endif
    … …  
    674681  periods      -poll $RUNPOLL
    675682  periods      -exec $RUNEXEC
    676   periods      -timeout 60
     683#  periods      -timeout 60
     684  periods      -timeout $timeout_mdb
    677685
    678686  task.exec
    … …  
    693701
    694702    $run = addtool -flipminidvodbrun -minidvodb_group $MINIDVODB_GROUP
    695    
    696703   
    697704if ($DB:n == 0)

  • branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro

    r39548 r41211  
    4040$SURVEY_RELSTACK_DB = 0
    4141$SURVEY_STATICSKYSINGLE_DB = 0
    42 $SURVEY_EXEC = 120
     42$SURVEY_EXEC = 30
    4343$SURVEY_POLL = 10
    44 $SURVEY_TIMEOUT = 600
     44$SURVEY_TIMEOUT = 30
     45# $SURVEY_EXEC = 120
     46# $SURVEY_TIMEOUT = 600
    4547# the tasks for loading the release tabels for nightly science do not need to run very often
    4648$SURVEY_RELEASE_EXEC = 300
    … …  
    947949
    948950task survey.addstar
    949   host local
    950  
    951951  periods      -poll $SURVEY_POLL
    952952  periods      -exec $SURVEY_EXEC
    953953  periods      -timeout $SURVEY_TIMEOUT
     954
     955  host local
    954956  npending     1
    955957
    … …  
    961963    book npages SURVEY_ADDSTAR -var N
    962964    if ($N == 0)
    963 #      echo "No labels for processing"
     965      echo "No labels for processing survey.addstar"
    964966      break
    965967    endif
    … …  
    997999   
    9981000    $run = $run -definebyquery -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group -stage $stage
    999     # echo $run
    10001001    if ("$stage" == "cam")
    1001         #only queue destreaked cams. stacks and staticsky don't need this
    1002     #    if ("$DB:$SURVEY_ADDSTAR_DB" == "isp")
    1003             #this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn't use magicked (ie, isp), then do not queue destreaked
     1002        #only queue destreaked cams. stacks and staticsky dont need this
     1003#       if ("$DB:$SURVEY_ADDSTAR_DB" == "isp")
     1004           # this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn use magicked (ie, isp), then do not queue destreaked
    10041005           # now with no magic, all are uncensored
    10051006           $run = $run -uncensored
    10061007#       else
    1007            #if not isp, then run destreaked version only
     1008           # if not isp, then run destreaked version only
    10081009#          $run = $run -destreaked
    10091010#       end
    … …  
    10181019    end
    10191020    if ("$stage" == "skycal")
    1020         #skycal doesn't have magic, however, we still need to tell addtool
     1021        #skycal doesnt have magic, however, we still need to tell addtool
    10211022        $run = $run -uncensored
    10221023    end
    … …  
    10281029    end
    10291030    # we need to handle isp/gpc1: gpc1 wants destreaked, isp wants uncensored.  Perhaps the best way is by default do destreaked (the most paranoid), and if db = isp (is this the best way?) then do uncensored
    1030    
    10311031
    10321032    echo $run
Note: See TracChangeset for help on using the changeset viewer.