Skip to content

Make return code optional - #934

Merged
Aurashk merged 1 commit into
developfrom
emmuhamm/return-code-optional
Jun 1, 2026
Merged

Make return code optional #934
Aurashk merged 1 commit into
developfrom
emmuhamm/return-code-optional

Conversation

@emmuhamm

Copy link
Copy Markdown
Member

Description

Changes to account for DUNE-DAQ/druncschema#86

Basically adds a x.HasField() check on return codes to ensure nothing funky goes on.

Type of change

  • Optimization

List of required branches from other repositories

DUNE-DAQ/druncschema#86

Suggested manual testing checklist

Run MSQT

Developer checklist

Prior to marking this as "Ready for Review"

Tests ran on: np04 srv 28 from release 27 may 2026 nightly

Unit tests - some tests can't be ran on the CI. This is documented. If this PR checks a feature that can't be tested with CI, this has been marked appropriately.

Integration tests - the daqsystemtest_integtest_bundle requires a lot of resources, and connections to the EHN1 infrastructure. Check the cross referenced list if you can't run these. The developer needs to run at least the .

  • Unit tests (pytest --marker) passed
    • With relevant marker
    • Without marker
  • Integration tests passed
    • Only daqsystemtest_integtest_bundle.sh -k minimal_system_quick_test.py
    • Full daqsystemtest_integtest_bundle.sh
  • Testing skipped as there are no core code changes in this PR, this only relates to documentation/CI workflows
  • Drunc integration tests pass (./scripts/drunc_integtest_bundle.sh)

Final checklist prior to marking this as "Ready for Review"

  • Code is clearly commented.
  • New unit tests have been added, or is documented in # ISSUE NUMBER
  • A suitable reviewer has been chosen from this list.

Reviewer checklist

  • This branch has been rebased with develop prior to testing.
  • Suggested manual tests show changes.
  • CI workflows fails documented (if present)
  • Integration tests passed (on either np0x or IC HEP clusters)
    • Use the following guidelines to determine which of the integration tests you need to run
      • You do not need to run any integration tests if
        • Code changes are not associated with src/
        • PR changes only affect docstrings
        • In this case, be sure to validate any suggested manual testing.
      • Run only the minimum integration test as daqsystemtest_integtest_bundle.sh -k minimal_system_quick_test.py if
        • PR changes only affect a few log entries
        • PR changes are small, and do not have a large impact on the workflow (use carefully)
      • Otherwise run the full integration test bundle as daqsystemtest_integtest_bundle.sh
    • What to do if the integration tests fail?
      • Only concern yourself if failures related to drunc are in the log files
      • If non-drunc failure appears:
        • Validate failure in fresh working area
        • Contact Pawel if unsure
  • If you have ran the full integration test bundle, leave a comment on the PR stating
    • Which host the integration tests have ran on
    • [Optional] A copy of the test summary
  • Drunc integration tests pass (scripts/drunc_integtest_bundle.sh)

Once the above boxes are checked, the PR(s) can be merged following the steps below.

Prior to merging

Choose one of the following an complete all substeps
  • Changes only affect the Run Control, are in a single repository, and do not affect the end user.
    • Changes are documented in docstrings and code comments
    • Wiki has been updated if architectural or endpoint changes
  • Otherwise
    • Workflow changes demonstrated in the Change Log (if necessary)
    • Wiki has been updated (if necessary)
    • #dunedaq-integration Slack channel notified (see below)

Once completed, the reviewer can merge the PR.

Notification message for a Slack channel

Note - this should be to #dunedaq-integration for general workflow that isn't during a release candidate period, and to #daq-release-prep otherwise.

For an single merge that changes the user workflow

The CCM WG has an isolated PR ready to merge that affects user workflows. The PR is:

_URL_

I will leave time for any comments, otherwise will merge these at the end of the work day _Insert your time zone_.

For co-ordinated merge

The CCM WG has a set of co-ordinated merges ready to merge. The PRs are:

_URL_

_URL_


I will leave time for any comments, otherwise will merge these at the end of the day.

@emmuhamm
emmuhamm requested review from Aurashk and PawelPlesniak May 29, 2026 11:09
@emmuhamm emmuhamm self-assigned this May 29, 2026
@emmuhamm

Copy link
Copy Markdown
Member Author

Hi @PawelPlesniak, @Aurashk, I've assigned you both as reviewer for the set of changes that should close DUNE-DAQ/druncschema#15

These are two correlated PRs:

they should be simple enough.

Change log is just in the druncschema, ive changed it to optional, and in drunc ive added a hasfield check to ensure that the values are always valid.

Happy for either of you to review and merge these two whenever you have the time to do so

@Aurashk Aurashk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good improvement!

@Aurashk

Aurashk commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

I ran MSQT on hep with the corresponding druncschema branch and it passed

@Aurashk
Aurashk merged commit 45624fd into develop Jun 1, 2026
5 checks passed
@Aurashk
Aurashk deleted the emmuhamm/return-code-optional branch June 1, 2026 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants