Skip to content

Fix version mismatch error when dispatching encoded hints in storage compatibility mode #2179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
driftx merged 1 commit into from
Dec 16, 2025
Merged

Fix version mismatch error when dispatching encoded hints in storage compatibility mode #2179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/java/org/apache/cassandra/hints/HintMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ else if (obj instanceof Encoded)
{
Encoded message = (Encoded) obj;

if (version != message.version)
throw new IllegalArgumentException("serializedSize() called with non-matching version " + version +
" for message with version " + message.version);

// UUID serialization is version-independent, VInt encoding is version-independent,
// and hint bytes are written verbatim. The size is the same regardless of the version
// passed, so we don't need to check for version mismatch here. This allows encoded
// hints written at the storage compatibility version to be dispatched correctly
// even when the peer is at a different (newer) messaging version.
long size = UUIDSerializer.serializer.serializedSize(message.hostId, version);
size += TypeSizes.sizeofUnsignedVInt(message.hint.remaining());
size += message.hint.remaining();
Expand Down Expand Up @@ -147,9 +148,11 @@ else if (obj instanceof Encoded)
{
Encoded message = (Encoded) obj;

if (version != message.version)
throw new IllegalArgumentException("serialize() called with non-matching version " + version);

// UUID serialization and VInt encoding are version-independent, and hint bytes are
// written verbatim (already encoded at message.version). This allows encoded hints
// written at the storage compatibility version to be dispatched correctly even when
// the peer is at a different (newer) messaging version. The receiver will deserialize
// the hint bytes using the appropriate version based on the hint file descriptor.
UUIDSerializer.serializer.serialize(message.hostId, out, version);
out.writeUnsignedVInt32(message.hint.remaining());
out.write(message.hint);
Expand Down