Skip to content

[4.1.2 Backport] CBG-5744: fix TestResyncRegenerateCorruptDocumentSequence (test-only) - #8635

Merged
bbrks merged 1 commit into
release/4.1.2from
CBG-5744
Aug 26, 2026
Merged

[4.1.2 Backport] CBG-5744: fix TestResyncRegenerateCorruptDocumentSequence (test-only)#8635
bbrks merged 1 commit into
release/4.1.2from
CBG-5744

Conversation

@torcolvin

@torcolvin torcolvin commented Aug 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

CBG-5744

Clean cherry pick of #8471 to 4.1.2

test-only

🤖 Opened with the sync-gateway-backport skill in Claude Code

@torcolvin
torcolvin marked this pull request as ready for review August 20, 2026 15:34
@torcolvin
torcolvin requested review from a team and a lite review from Copilot August 20, 2026 15:34
@torcolvin torcolvin changed the title [4.1.2 Backport] CBG-5744: fix TestResyncRegenerateCorruptDocumentSequence [4.1.2 Backport] CBG-5744: fix TestResyncRegenerateCorruptDocumentSequence (test-only) Aug 20, 2026
This was referenced Aug 20, 2026
Merged
Merged
Copilot AI reviewed Aug 20, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This backport updates a Sync Gateway admin API resync unit test to avoid a race where the resync can transition to Completed before the test observes the Running state.

Changes:

  • Remove the intermediate wait for BackgroundProcessStateRunning in TestResyncRegenerateSequencesCorruptDocumentSequence.
  • Wait only for BackgroundProcessStateCompleted after starting the resync to reduce test flakiness.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@torcolvin
torcolvin requested a review from bbrks August 20, 2026 15:49
@torcolvin torcolvin mentioned this pull request Aug 24, 2026
Merged
@bbrks

bbrks commented Aug 25, 2026

Copy link
Copy Markdown
Member

rest/adminapitest/admin_api_test.go — dropped; that half of the upstream commit depends on the resyncPauser helper and base.VBucket0DocIDs, neither of which exists on 4.1.2.

I think the backport skill needs tweaking to not make these kinds of decisions autonomously (I'm presuming this was unprompted)

@bbrks bbrks assigned torcolvin and unassigned bbrks Aug 25, 2026
@torcolvin torcolvin mentioned this pull request Aug 26, 2026
Merged
@torcolvin torcolvin assigned bbrks and unassigned torcolvin Aug 26, 2026
@torcolvin @claude
[4.1.2 Backport] CBG-5744: fix TestResyncRegenerateCorruptDocumentSeq…
03a2992 
…uence

Cherry-picked from 2b0cadc (CBG-5631, #8471).

Co-Authored-By: Tor Colvin <tor.colvin@couchbase.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@bbrks
bbrks merged commit 536abd5 into release/4.1.2 Aug 26, 2026
41 of 42 checks passed
@bbrks
bbrks deleted the CBG-5744 branch August 26, 2026 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@bbrks bbrks bbrks approved these changes

Assignees

@bbrks bbrks

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@torcolvin @bbrks