Skip to content

Commit

Permalink
DM-36375 fast handle dev/test tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoyuyoung committed Oct 21, 2022
1 parent 2152d6f commit dcd51a5
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
5 changes: 5 additions & 0 deletions config/bps_panda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ defaultPreCmdOpts: "--long-log --log-level=VERBOSE --log-file payload-log.json"
# Limit the number of jobs in a single PanDA task
maxJobsPerTask: 30000

# Default production label: managed
prodSourceLabel: managed

# Default job priority
priority: 500

pipetask:
pipetaskInit:
Expand Down
3 changes: 3 additions & 0 deletions doc/changes/DM-36375.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fast handle dev/test tasks
* ``prodSourceLabel``: it can be configured in the submission yaml, by default it is 'managed'
* ``priority``: it can be set in the submission yaml, by default it is 500
6 changes: 3 additions & 3 deletions python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# An example bps submission yaml
# Need to setup USDF before submitting the yaml
# source setupUSDF.sh
# Need to setup SDF before submitting the yaml
# source setup_panda.sh w_2022_32 sdf

LSST_VERSION: w_2022_32

Expand All @@ -11,7 +11,7 @@ queue: "SLAC_Rubin_SDF"

executionButler:
requestMemory: 4000
queue: "SLAC_Rubin_SDF"
queue: "SLAC_Rubin_SDF_Big"

pipelineYaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#isr"

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# An example bps submission yaml
# Need to setup USDF before submitting the yaml
# source setupUSDF.sh
# source setup_panda.sh w_2022_32

LSST_VERSION: w_2022_32

Expand Down
4 changes: 2 additions & 2 deletions python/lsst/ctrl/bps/panda/panda_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def submit(self, workflow):

_, processing_type = self.config.search("processing_type", opt={"default": None})
_, task_type = self.config.search("task_type", opt={"default": "test"})
_, prod_source_label = self.config.search("prod_source_label", opt={"default": "test"})
_, prod_source_label = self.config.search("prodSourceLabel", opt={"default": None})
_, vo = self.config.search("vo", opt={"default": "wlcg"})

for idx, task in enumerate(workflow.generated_tasks):
Expand Down Expand Up @@ -178,7 +178,7 @@ def submit(self, workflow):
working_group=task.working_group,
processing_type=processing_type,
task_type=task_type,
prodSourceLabel=task.prod_source_label if task.prod_source_label else prod_source_label,
prodSourceLabel=prod_source_label if prod_source_label else task.prod_source_label,
vo=vo,
maxattempt=task.max_attempt,
maxwalltime=task.max_walltime if task.max_walltime else 90000,
Expand Down

0 comments on commit dcd51a5

Please sign in to comment.