[4.1.2 Backport] CBG-5752: switch names from Resume -> Join - #8660
Merged
Conversation
This was referenced Aug 24, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This backport aligns the 4.1.2 branch with main by renaming the BackgroundManager “Resume” concept to “Join” for multi-node/background-process cluster participation, updating related callback plumbing and docstrings while keeping persisted constants and wire format unchanged.
Changes:
- Renamed
BackgroundManager.Resume→Joinandstart(..., isResume)→start(..., isJoin)across DB/resync integration points. - Updated
DatabaseStateMgrresync callback type/field naming from “resume” to “join”, including logging text. - Updated unit tests and doc/comments to reflect “Join” terminology.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| db/database.go | Wires distributed resync “join” callback into DatabaseStateMgr. |
| db/database_state.go | Renames resync callback type/field to “join” and updates warning message text. |
| db/database_state_test.go | Updates test names/descriptions to match “join” terminology. |
| db/background_mgr.go | Renames exported API to Join, updates internal parameter naming and expands doc comments. |
| db/background_mgr_test.go | Renames/updates tests to call Join and reflect new terminology. |
| db/background_mgr_resync_dcp.go | Updates resync manager comments referring to persisted start options for Join. |
| db/background_mgr_resync_dcp_test.go | Updates resync manager tests/comments referring to Join behavior. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
bbrks
previously approved these changes
Aug 25, 2026
torcolvin
dismissed
bbrks’s stale review
August 25, 2026 20:02
The merge-base changed after approval.
bbrks
previously approved these changes
Aug 26, 2026
bbrks
left a comment
bbrks
left a comment
Member
There was a problem hiding this comment.
approved but the parent commit is duplicated in this branch as well as in the parent branch
I think gh stack is likely to blame
bbrks
previously approved these changes
Aug 26, 2026
torcolvin
dismissed
bbrks’s stale review
August 26, 2026 17:54
The merge-base changed after approval.
Cherry-picked from 2b68789 (CBG-5435, #8470). Renames BackgroundManager.Resume to Join (and the start() isResume parameter to isJoin) plus the doc comments that go with it. No behaviour change: the Join body, the persisted backgroundManagerStatusResume / backgroundManagerInitResume constants and the wire format are all untouched. Ordered below the CBG-5743 and CBG-5594 backports to match upstream, where this rename (2026-07-22) landed before CBG-5496 (#8454, 2026-08-04) and CBG-5521 (#8468, 2026-08-05). Co-Authored-By: Tor Colvin <tor.colvin@couchbase.com> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
bbrks
approved these changes
Aug 26, 2026
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.
CBG-5752
Clean cherry pick of #8470 (CBG-5435) to 4.1.2
Stacked on #8635 (CBG-5744), and sits below #8631 (CBG-5743) and #8632 (CBG-5594) to match upstream order: this rename landed 2026-07-22, before CBG-5496 (#8454) and CBG-5521 (#8468).
Pure rename, no behaviour change:
BackgroundManager.Resume→Joinand thestart()isResumeparameter →isJoin. TheJoinbody, the persistedbackgroundManagerStatusResume/backgroundManagerInitResumeconstants and the wire format are untouched. Backported ahead of the remaining BackgroundManager work so those backports apply against matching identifiers instead of each carrying the rename as conflict noise.🤖 Opened with the
sync-gateway-backportskill in Claude Code