Skip to content

shorter hostnames#831

Closed
wanyunSu wants to merge 1 commit intodevelopfrom
wanyunSu/fix-host-again
Closed

shorter hostnames#831
wanyunSu wants to merge 1 commit intodevelopfrom
wanyunSu/fix-host-again

Conversation

@wanyunSu
Copy link
Copy Markdown
Contributor

@wanyunSu wanyunSu commented Mar 17, 2026 •
edited
Loading

Description

Fixes issue #792

Instead of FQDN (np04-srv-029.cern.ch), shows short names (np04-srv-029) on status table.

drunc-unified-shell > status
                                           claudia-k8s status                                           
┏━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━┳━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃ Name                   ┃ Info ┃ State   ┃ Substate ┃ In error ┃ Included ┃ Endpoint                  ┃
┡━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━╇━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
│ root-controller        │      │ initial │ initial  │ No       │ Yes      │ grpc://np04-srv-029:30116 │
│   df-controller        │      │ initial │ initial  │ No       │ Yes      │ grpc://np04-srv-029:39195 │
│     dfo-01             │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:60697 │
│     tp-stream-writer   │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:36121 │
│   hsi-fake-controller  │      │ initial │ initial  │ No       │ Yes      │ grpc://np04-srv-029:45095 │
│     hsi-fake-01        │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:40025 │
│     hsi-fake-to-tc-app │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:47469 │
│   trg-controller       │      │ initial │ initial  │ No       │ Yes      │ grpc://np04-srv-029:38903 │
│     mlt                │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:45301 │
│     tc-maker-1         │      │ initial │ idle     │ No       │ Yes      │ rest://np04-srv-029:33329 │

Type of change

  • New feature / enhancement
  • Optimization
  • Bug fix
  • Breaking change
  • Documentation

List of required branches from other repositories

WHAT PRs NEED TO BE INCLUDED TO MAKE THE CHANGE.

Change log

WHAT HAS CHANGED.

Suggested manual testing checklist

LIST COMMANDS TO DEMONSTRATE CHANGE

Developer checklist

Prior to marking this as "Ready for Review"

Tests ran on: WHAT HOSTNAME from release RELEASE_NAME

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

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
    • 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

Once the features are validated and both the unit and integration tests pass, the PRs is ready to be merged.

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)
    • #daq-sw-librarians Slack channel notified (see below)

Once completed, the reviewer can merge the PR.

Notification message for #daq-sw-librarians Slack channel

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.

@wanyunSu wanyunSu self-assigned this Mar 17, 2026
@wanyunSu wanyunSu requested a review from PawelPlesniak March 18, 2026 13:53
@PawelPlesniak
Copy link
Copy Markdown
Collaborator

PawelPlesniak commented Mar 18, 2026

Hi @wanyunSu, thank you for this. What was the motivation for removing the suffix as opposed to populating everything? Also, please run all the required tests, you have not completed any part of the task denoted in the Developer checklist section of this PR

@wanyunSu
Copy link
Copy Markdown
Contributor Author

wanyunSu commented Mar 25, 2026

the correct fix is in anther PR #861

@wanyunSu wanyunSu closed this Mar 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PawelPlesniak PawelPlesniak Awaiting requested review from PawelPlesniak

Assignees

@wanyunSu wanyunSu

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wanyunSu @PawelPlesniak @dunedaqbot