Skip to content

[release-23.0] VTOrc: fix PrimaryIsReadOnly recovery deadlock against PrimarySemiSyncBlocked (#20015)#20082

Merged
timvaillancourt merged 2 commits into
release-23.0from
backport-20015-to-release-23.0
May 14, 2026
Merged

[release-23.0] VTOrc: fix PrimaryIsReadOnly recovery deadlock against PrimarySemiSyncBlocked (#20015)#20082
timvaillancourt merged 2 commits into
release-23.0from
backport-20015-to-release-23.0

Conversation

@vitess-bot
Copy link
Copy Markdown
Contributor

@vitess-bot vitess-bot Bot commented May 12, 2026

Description

This is a backport of #20015

Copilot AI review requested due to automatic review settings May 12, 2026 13:08
@vitess-bot vitess-bot Bot added Type: Bug Backport This is a backport Component: VTOrc Vitess Orchestrator integration Skip CI Skip CI actions from running Merge Conflict labels May 12, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@vitess-bot
Copy link
Copy Markdown
Contributor Author

vitess-bot Bot commented May 12, 2026

Hello @timvaillancourt, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 20082
git reset --hard origin/release-23.0
git cherry-pick -m 1 dc67850af6f2369d9c7e7dc4dc3111659bbe3636

@github-actions github-actions Bot added this to the v23.0.5 milestone May 12, 2026
@timvaillancourt timvaillancourt removed Skip CI Skip CI actions from running Merge Conflict labels May 12, 2026
- vtorc_test.go: keep only sync import (strings unused by new code)
- analysis_dao.go: keep release-23.0 fmt.Sprintf (no PrimaryHealthUnhealthy field)
- topology_recovery_test.go: adapt analyzedAlias to string (release-23.0 API)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt marked this pull request as ready for review May 12, 2026 13:16
Copilot AI review requested due to automatic review settings May 12, 2026 13:16
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment thread go/vt/vtorc/inst/analysis_dao.go
@timvaillancourt timvaillancourt enabled auto-merge (squash) May 12, 2026 13:25
@timvaillancourt timvaillancourt self-assigned this May 12, 2026
@timvaillancourt timvaillancourt merged commit 62616f8 into release-23.0 May 14, 2026
130 of 141 checks passed
@timvaillancourt timvaillancourt deleted the backport-20015-to-release-23.0 branch May 14, 2026 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport This is a backport Component: VTOrc Vitess Orchestrator integration Type: Bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants