You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jo...@apache.org on 2023/04/25 18:18:53 UTC

[cassandra] branch cassandra-4.0 updated: Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest

This is an automated email from the ASF dual-hosted git repository.

jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
     new 09c1e67598  Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest
09c1e67598 is described below

commit 09c1e67598d7a0dc7da7bebee358fbc96d84680a
Author: Jon Meredith <jo...@apache.org>
AuthorDate: Fri Apr 21 15:24:58 2023 -0600

     Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest
    
    patch by Jon Meredith; reviewed by Caleb Rackliffe for CASSANDRA-18474
---
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 35a0fc16d6..d4b305e7f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.10
+ * Incremental repairs fail on mixed IPv4/v6 addresses serializing SyncRequest (CASSANDRA-18474)
  * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443)
  * Fix nested selection of reversed collections (CASSANDRA-17913)
 
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index 9886abc6fe..a5579add83 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -111,7 +111,7 @@ public class SyncRequest extends RepairMessage
         public SyncRequest deserialize(DataInputPlus in, int version) throws IOException
         {
             RepairJobDesc desc = RepairJobDesc.serializer.deserialize(in, version);
-            InetAddressAndPort owner = inetAddressAndPortSerializer.deserialize(in, version);
+            InetAddressAndPort initiator = inetAddressAndPortSerializer.deserialize(in, version);
             InetAddressAndPort src = inetAddressAndPortSerializer.deserialize(in, version);
             InetAddressAndPort dst = inetAddressAndPortSerializer.deserialize(in, version);
             int rangesCount = in.readInt();
@@ -120,13 +120,15 @@ public class SyncRequest extends RepairMessage
                 ranges.add((Range<Token>) AbstractBounds.tokenSerializer.deserialize(in, IPartitioner.global(), version));
             PreviewKind previewKind = PreviewKind.deserialize(in.readInt());
             boolean asymmetric = in.readBoolean();
-            return new SyncRequest(desc, owner, src, dst, ranges, previewKind, asymmetric);
+            return new SyncRequest(desc, initiator, src, dst, ranges, previewKind, asymmetric);
         }
 
         public long serializedSize(SyncRequest message, int version)
         {
             long size = RepairJobDesc.serializer.serializedSize(message.desc, version);
-            size += 3 * inetAddressAndPortSerializer.serializedSize(message.initiator, version);
+            size += inetAddressAndPortSerializer.serializedSize(message.initiator, version);
+            size += inetAddressAndPortSerializer.serializedSize(message.src, version);
+            size += inetAddressAndPortSerializer.serializedSize(message.dst, version);
             size += TypeSizes.sizeof(message.ranges.size());
             for (Range<Token> range : message.ranges)
                 size += AbstractBounds.tokenSerializer.serializedSize(range, version);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org