Repository navigation
feat: implement issue #1103 — cmd_rollback moves the bare <agent>/<ring> tag, not <agent>/v<M>-<ring> — the emergency lever is a silent no-op for every v-scoped agent #1117
+123
−5
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2513,14 +2513,46 @@ cmd_rollback() { | |
| local target | ||
| target="$(_gh_tag_commit "$host" "$agent/$to")" | ||
| [ -z "$target" ] && { echo "::error::release tag $agent/$to not found on $host" >&2; return 1; } | ||
| # Resolve the RING tag with fallback (major-scoped-channels epic #657 F4): PREFER the | ||
| # v-scoped `<agent>/v<M>-<ring>` within the agent's current major line when it exists, | ||
| # else the legacy bare `<agent>/<ring>`. Moving the bare tag on a v-scoped fleet relocated | ||
| # a tag no caller pins and still exited 0 — a silent no-op on the emergency lever (#1103). | ||
| # First check if the v-scoped tier exists; if not, fall back to bare. | ||
| # (The `--to` release tag above is always the bare immutable `<agent>/vX.Y.Z`, so it is | ||
| # correctly resolved without a major.) | ||
| local ring_tag ring_commit | ||
| IFS=$'\t' read -r ring_tag ring_commit < <(_resolved_channel "$agent" "$ring") | ||
| # If the resolved tag (v-scoped or bare from _resolved_channel's logic) doesn't exist, | ||
| # and we got v-scoped, try the bare tag as a fallback. The agent may have released v<M>.*.* | ||
| # but not yet seeded channel tier tags, so bare still matters as an intermediate step. | ||
| if [ -z "$ring_commit" ] && [[ "$ring_tag" == *"/v"[0-9]* ]]; then | ||
|
There was a problem hiding this comment. 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win 🔎 Supported by static analysis🏁 Script executed: #!/usr/bin/env bash
set -euo pipefail
# Inspect the remote tag lookup contract and shell error handling.
rg -n -C 12 '(^set -|^_gh_tag_commit\(|^_channel_tag_commit\(|^cmd_rollback\()' \
scripts/canary-rollout.sh
# Inspect existing failure stubs for tag reads.
rg -n -C 8 'git/ref/tags|_gh_tag_commit|rollback' tests/canary_rollout.batsRepository: petry-projects/.github Length of output: 46800 🏁 Script executed: #!/usr/bin/env bash
set -euo pipefail
printf '%s\n' '--- channel lookup ---'
sed -n '281,320p' scripts/canary-rollout.sh
printf '%s\n' '--- rollback resolution ---'
sed -n '1383,1465p' scripts/canary-rollout.sh
printf '%s\n' '--- related resolver ---'
rg -n -C 18 '^_resolved_channel\(|_channel_tag_commit' scripts/canary-rollout.shRepository: petry-projects/.github Length of output: 17293 Abort on non-not-found tag lookup failures.
🤖 Prompt for AI AgentsSource: Learnings |
||
| # Constructed ring_tag was v-scoped and doesn't exist; try bare. | ||
| local bare_commit bare_tag | ||
| bare_tag="$agent/$ring" | ||
| bare_commit="$(_channel_tag_commit "$agent" "$ring")" | ||
| if [ -n "$bare_commit" ]; then | ||
| ring_tag="$bare_tag" | ||
| ring_commit="$bare_commit" | ||
| else | ||
| # Both v-scoped and bare are absent; report the bare tag in the error message. | ||
| ring_tag="$bare_tag" | ||
| fi | ||
| fi | ||
| # Fail loudly rather than no-op (#1103): if BOTH v-scoped and bare (if tried) don't exist, | ||
| # refuse to create-and-move a channel tag nobody pins. The worst failure mode for rollback | ||
| # is a silent no-op that exits 0, so make it loud. | ||
| if [ -z "$ring_commit" ]; then | ||
| echo "::error::rollback target ring tag $ring_tag does not exist on $host — refusing to create-and-move a channel tag nobody pins (that would be a silent no-op). Check the ring name and the agent's major line." >&2 | ||
| return 1 | ||
| fi | ||
|
Comment on lines
+2544
to
+2547
There was a problem hiding this comment. Suggestion: Assessment: 🟠
Prompt for AI Agent 🤖This is a comment left during a code review.
**Path:** scripts/canary-rollout.sh
**Line:** 1375:1378
**Comment:**
*Possible Bug: `_channel_tag_commit` hides GitHub read failures as empty output, so a transient outage is reported as a missing tag and blocks an otherwise valid emergency rollback.
Validate the correctness of the flagged issue. If correct, How can I resolve this? If you propose a fix, implement it and please make it concise.
Once fix is implemented, also check other comments on the same PR, and ask user if the user wants to fix the rest of the comments as well. if said yes, then fetch all the comments validate the correctness and implement a minimal fix |
||
| echo "rolling back $ring_tag -> $to (${target:0:12}) on $host" | ||
| if [ "$dry" = true ]; then | ||
| echo "[DRY-RUN] would: gh api PATCH repos/$host/git/refs/tags/$ring_tag sha=$target (force)" | ||
| return 0 | ||
| fi | ||
| _gh_move_tag "$host" "$ring_tag" "$target" \ | ||
| || { echo "::error::failed to move $ring_tag -> $to on $host" >&2; return 1; } | ||
| echo "rolled back $ring_tag -> $to" | ||
| } | ||
|
|
||
| # ── blocker-issue + fleet-status automation (auto-triage of held promotions) ──── | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion:
_resolved_channelderives the tag from the highest release major, not the caller’s channel major, so valid pins likev1-stableare skipped or rollback targets an unused tag. [api mismatch]Assessment: 🟠
Major· 🔁Occurrence: SometimesPrompt for AI Agent 🤖