[14.5-stable] tests/zfs: bump /persist metric wait budgets#1184
Open
eriknordmark wants to merge 1 commit into
Open
[14.5-stable] tests/zfs: bump /persist metric wait budgets#1184eriknordmark wants to merge 1 commit into
eriknordmark wants to merge 1 commit into
Conversation
The 1-min budget on capture-persist-baseline.sh was too tight against EVE's actual time-to-first-metric. On slow-boot CI runs volumemgr's diskMetricsTimerTask doesn't tick for ~45 s after onboarding completes, and zedagent ships device metrics on its own 60 s ticker that the test doesn't reconfigure — so the first /persist entry can land ~100 s after onboarding even on a healthy run. Two recent failures of state_and_layout_check.txt:25 (lf-edge/eve runs 25730296544 on 2026-05-12 and 26033232173 on 2026-05-18) hit the deadline at exactly 60 s, with zedagent's metric.log showing four metric reports in the window all carrying empty dm.disk arrays. Bump the baseline capture from 1 min to 5 min, and the post-resize wait-for-persist-grew from 4 min to 5.5 min so a worst-case zedagent metric-tick alignment after the perturbation doesn't trip it either. Both scripts exit on the first successful poll, so the happy path is unchanged; only genuinely-slow boots burn the extra time. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit 0f6a0db)
This was referenced May 19, 2026
eriknordmark
requested review from
europaul and
rene
and removed request for
uncleDecart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #1181.
How to test and validate this PR
Covered by the eden CI matrix on this PR —
Storage (zfs)andSmoke (zfs, *)jobs exercisestate_and_layout_check.txtdirectly. The fix bumps the inner shell DEADLINEs and outerexec -tbudgets in two embedded scripts so a slow-boot run where volumemgr'sdiskMetricsTimerTasklands ~45 s after onboarding (and zedagent ships the next metric tick ~60 s later) no longer hits the 60 s deadline oncapture-persist-baseline.sh. Both scripts exit on the first successful poll, so the happy path is unchanged.Cherry-pick applied cleanly from master with no conflicts; nothing in the surrounding test depends on master-only infrastructure.
Once #1181 is merged on master, the
(cherry picked from commit ...)line here points at the topic-branch SHA (0f6a0db) rather than the master squash SHA — content is identical and can be amended on merge if preferred.Changelog notes
No user-facing changes.
PR Backports