Skip to content

kvstorage: stage a WAG event for replica subsumption#168333

Merged
trunk-io[bot] merged 3 commits intocockroachdb:masterfrom
arulajmani:rse-subsume-wag-event
Apr 15, 2026
Merged

kvstorage: stage a WAG event for replica subsumption#168333
trunk-io[bot] merged 3 commits intocockroachdb:masterfrom
arulajmani:rse-subsume-wag-event

Conversation

@arulajmani
Copy link
Copy Markdown
Collaborator

@arulajmani arulajmani commented Apr 14, 2026

  • Extract test helpers from TestDestroyReplica to make them reusable.
  • Add TestSubsumeReplica using the shared helpers.
  • Wire up SubsumeReplica to write an EventSubsume WAG node, mirroring
    DestroyReplica's EventDestroy. The snapshot application path doesn't
    have things wired up yet, so that's left for a future patch.

Part of #165186

@arulajmani arulajmani requested a review from a team as a code owner April 14, 2026 15:17
@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io bot commented Apr 14, 2026

😎 Merged successfully - details.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@arulajmani arulajmani requested a review from pav-kv April 14, 2026 15:18
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 14, 2026

Detected infrastructure failure (matched: ). Automatically rerunning failed jobs. (run link)

1 similar comment
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 14, 2026

Detected infrastructure failure (matched: ). Automatically rerunning failed jobs. (run link)

@arulajmani arulajmani force-pushed the rse-subsume-wag-event branch from 423aa0e to a18afa3 Compare April 14, 2026 17:08
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 14, 2026

Detected infrastructure failure (matched: self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link)

Copy link
Copy Markdown
Collaborator

@pav-kv pav-kv left a comment

Choose a reason for hiding this comment

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

LGTM % rebase. I think one of the intermediate commits will be temporarily broken after the fixup in the parent PR (a stricter assertion).

Comment thread pkg/kv/kvserver/kvstorage/destroy_test.go
arulajmani and others added 3 commits April 15, 2026 11:38
Release note: None
Epic: None
Extract printBatch, mutate, mutateSep, and the engine subtest
boilerplate into reusable test helpers. Burns down a TODO on
replicaInfo. The next commit introduces a TestSubsumeReplica that'll
lean on these.

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
SubsumeReplica now writes an EventSubsume WAG node, mirroring what
DestroyReplica does with EventDestroy. A test mirroring
TestDestroyReplica is added. The snapshot application path doesn't
have things wired up yet, so that's left for a future patch.

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
@arulajmani arulajmani force-pushed the rse-subsume-wag-event branch from a18afa3 to 6f17bcb Compare April 15, 2026 18:36
@arulajmani
Copy link
Copy Markdown
Collaborator Author

I ended up squashing the two commits to get around the broken test issue. TFTR!

@pav-kv
Copy link
Copy Markdown
Collaborator

pav-kv commented Apr 15, 2026

nag: link to the issue

@trunk-io trunk-io bot merged commit 1d261e1 into cockroachdb:master Apr 15, 2026
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants