crosscluster: fix mixed-version RangeStats type mismatch#166349
crosscluster: fix mixed-version RangeStats type mismatch#166349trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
kev-cao
requested review from
dt and
rharding6373
and removed request for
a team
|
😎 Merged successfully - details. |
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
kev-cao
force-pushed
the
crosscluster/mixed-version-rangestats
branch
from
65cf3a1 to
a3c2925
Compare
PR cockroachdb#163427 extracted `StreamEvent.RangeStats` from `streampb` into `rangescanstatspb.RangeStats`. While the wire contents are identical, the nominal type changed, which causes `pbtypes.UnmarshalAny` type checks to fail. In a mixed 26.1/26.2 cluster, nodes pass around both types, blocking the resolved timestamp from progressing. This commit adds back the `streampb.StreamEvent.RangeStats` message and uses it for marshaling DistSQL progress metadata until the cluster is fully on 26.2. The unmarshal path tries both types for compatibility in either direction. Fixes: cockroachdb#164640 Release note: None Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
kev-cao
force-pushed
the
crosscluster/mixed-version-rangestats
branch
from
a3c2925 to
0b469d4
Compare
|
Detected infrastructure failure (matched: self-hosted runner lost communication with the server, self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link) |
|
TFTR! /trunk merge |
|
Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches. Issue #164640: branch-release-26.2. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
4 participants
PR #163427 extracted
StreamEvent.RangeStatsfromstreampbintorangescanstatspb.RangeStats. While the wire contents are identical, the nominal type changed, which causespbtypes.UnmarshalAnytype checks to fail. In a mixed 26.1/26.2 cluster, nodes pass around both types, blocking the resolved timestamp from progressing.This commit adds back the
streampb.StreamEvent.RangeStatsmessage and uses it for marshaling DistSQL progress metadata until the cluster is fully on 26.2. The unmarshal path tries both types for compatibility in either direction.Fixes: #164640
Release note: None
Co-Authored-By: roachdev-claude roachdev-claude-bot@cockroachlabs.com