Skip to content

DM-54613: daily batch submissions should be allowed to proceed even if there are no association jobs to run #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mxk62 wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −8
Open

DM-54613: daily batch submissions should be allowed to proceed even if there are no association jobs to run #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f4cd05
Do not throw if labels were not used in a group
mxk62 Apr 16, 2026
5c1fc34
Modify unit tests to reflect the changes
mxk62 Apr 20, 2026
eba1fd7
Add a news item describing the changes
mxk62 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/changes/DM-54613.other.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Changed BPS behavior so it doesn't throw when there are job labels in job ordering groups that were not included in the final version of the workflow.
From now on BPS will only warn the user when it occures.
7 changes: 4 additions & 3 deletions python/lsst/ctrl/bps/generic_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,9 +990,10 @@ def _check_job_ordering_config(self, ordering_config: dict[str, Any]) -> dict[st

if unused_labels:
_LOG.info("Workflow job labels = %s", ",".join(self._job_labels.labels))
raise RuntimeError(
f"Job label(s) ({','.join(unused_labels)}) from job ordering group "
f"{group} does not exist in workflow. Aborting."
_LOG.warning(
"Job label(s) (%s) from job ordering group %s does not exist in workflow.",
",".join(unused_labels),
group,
)

label_subgraph = self._job_labels.subgraph(job_labels)
Expand Down
14 changes: 9 additions & 5 deletions tests/test_generic_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,7 @@ def testCheckJobOrderingConfigBadLabel(self):

def testCheckJobOrderingConfigUnusedLabel(self):
gwf = gtu.make_3_label_workflow("test_unused_label", final=True)
with self.assertRaisesRegex(
RuntimeError,
r"Job label\(s\) \(unused1,unused2\) from job ordering group "
"order1 does not exist in workflow. Aborting.",
):
with self.assertLogs("lsst.ctrl.bps.generic_workflow", level=logging.WARNING) as cm:
gwf._check_job_ordering_config(
{
"order1": {
Expand All @@ -465,6 +461,14 @@ def testCheckJobOrderingConfigUnusedLabel(self):
},
}
)
self.assertTrue(
any(
"Job label(s) (unused1,unused2) from job ordering group order1 does not exist in workflow."
in record.getMessage()
for record in cm.records
),
"Expected warning about unused labels",
)

def testCheckJobOrderingConfigMissingDim(self):
gwf = gtu.make_3_label_workflow("test_missing_dim", final=True)
Expand Down
Loading