Skip to content

iocStats: load iocAdminScanMon.db with iocAdminSoft only on RTEMS - #258

Merged
gilesknap merged 1 commit into
mainfrom
iocstats-scanmon-dup
Nov 17, 2026
Merged

gilesknap merged 1 commit into
mainfrom
iocstats-scanmon-dup

Conversation

@gilesknap

Copy link
Copy Markdown
Member

What and why

iocStats 4.0.1, the version Linux generic IOCs build, already expands iocAdminScanMon.db into iocAdminSoft.db through iocAdminSoft.substitutions. The devIocStats.iocAdminSoft model also loads iocAdminScanMon.db on its own, so every Linux IOC defines the 15 ScanMon records (<IOC>:*HZ_MODE, *HZ_UPD_TIME, SCANMON_SEVR) twice.

RTEMS builds iocStats at 4226b12, where iocAdminSoft.db has no ScanMon records. This PR keeps the separate iocAdminScanMon.db load only when EPICS_TARGET_ARCH contains RTEMS, using databases[].enabled.

Impact

  • Every Linux generic IOC's ioc.subst loses one iocAdminScanMon.db block. The duplicate records go. Otherwise the IOC has the same records, and each ScanMon record is now defined once.
  • RTEMS IOCs are unchanged: they still load iocAdminScanMon.db.
  • No autosave is lost: the ScanMon req files are empty.

How it was verified

  • Before and after on the 70 configs described in ether_ip.ao drive limits; terminalserver channel autosave #257 (builder2ibek's samples, the ioc-terminalserver and ioc-dlslinuxvac tests, three GitLab instances and the 38 vacuum sweep IOCs).
  • A review checked that:
    • the record set is unchanged, with each ScanMon record defined once;
    • the ScanMon req files are empty, so no autosave settings are lost;
    • the RTEMS gate works: the epics-base runtime image sets EPICS_TARGET_ARCH, _global.get_env returns "" when the variable is unset, and with EPICS_TARGET_ARCH=RTEMS-beatnik generate2 loads iocAdminScanMon.db.
  • ibek ioc generate-schema */*.ibek.support.yaml --no-ibek-defs passes, which is the CI schema check.

Do not merge until the owner says so.

🤖 Generated with Claude Code

https://claude.ai/code/session_01Uybqz56DqeZEh7StNv1sdT

iocStats 4.0.1's iocAdminSoft.substitutions already expands
iocAdminScanMon.db into iocAdminSoft.db, so loading both defines the 15
ScanMon records (<IOC>:*HZ_MODE, *HZ_UPD_TIME, SCANMON_SEVR) twice in every
Linux IOC. RTEMS builds iocStats at 4226b12, where iocAdminSoft.db has no
ScanMon records, so iocAdminScanMon.db is still loaded there, chosen by the
image's EPICS_TARGET_ARCH.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Uybqz56DqeZEh7StNv1sdT
@coderabbitai

coderabbitai Bot commented Nov 16, 2026

Copy link
Copy Markdown

Warning

Review limit reached

This review ran on the open-source allowance, not this organization's plan, because the pull request author doesn't have an assigned seat. Waiting won't change this — ask an organization admin to assign them a seat, or add seats in Billing if every seat is already assigned, then retry.

Next included review available in 48 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 44032f2f-0fdb-4a1c-ab4a-842f8d12654f
Commits

Reviewing files that changed from the base of the PR and between e33e7be and fb777f6.

Files selected for processing: 1

  • iocStats/iocStats.ibek.support.yaml
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

@gilesknap
gilesknap merged commit b52909b into main Nov 17, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant