Explain blocking changes during refresh#840
Open
tlm wants to merge 4 commits into
Open
Conversation
47a1e69 to
0a223b2
Compare
Show clearer workshop refresh errors when another change is blocking the operation, including task details and refresh recovery commands when the blocking change is a paused refresh.
Return the blocking change conflict from refresh manifest loading when a workshop is pending or waiting on another change, so callers can surface the change kind, status, and task ID instead of a generic health error.
Add API coverage for refresh requests blocked by a waiting refresh, verifying the daemon returns a structured change-conflict error with the blocking change details.
Assert that a refresh blocked by a paused refresh shows the task details and abort or continue recovery commands in the refresh-abort spread test.
188cb3b to
e16d996
Compare
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
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.
Description
This PR is stacked on top of #831.
It builds on the structured change-conflict plumbing from
#829 and applies the same
user-facing treatment to
workshop refresh.It also follows the refresh output style from
#828, so refresh failures point users
directly to the relevant task details and recovery commands.
Previously, if
workshop refreshwas blocked by a paused refresh, the CLIsurfaced a generic error and then reported that refresh was aborted:
After this change,
workshop refreshexplains that the existing refresh ispaused, shows the task details command, and gives the abort or continue recovery
commands:
For non-refresh conflicts, the message identifies the blocking change kind:
The change keeps the same layering as the stop and start conflict work:
workshopstate.RefreshManifestspreserves typed change-conflict details whena workshop is pending or waiting on another change.
change-conflictresponses.client.ChangeConflictError.Validation run:
Self-review quick check
Docs
Procedure:
Content:
tutorial/andhow-to/sections).docs/.coverage.yamlupdated, coverage tags added (.. artefact).Or: