This is an automated email from the ASF dual-hosted git repository. jwest pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push: new 14d1e3e Fix communication between versions 3 and 4 in upgrade JVM DTests 14d1e3e is described below commit 14d1e3eb91189e1684583918305116061eba6413 Author: jacek-lewandowski <jacek.lewandow...@datastax.com> AuthorDate: Tue Jul 28 13:30:21 2020 +0200 Fix communication between versions 3 and 4 in upgrade JVM DTests patch by Jacek Lewandowski; reviewed by Jordan West for CASSANDRA-15946 --- src/java/org/apache/cassandra/net/Verb.java | 2 +- test/distributed/org/apache/cassandra/distributed/impl/Instance.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/net/Verb.java b/src/java/org/apache/cassandra/net/Verb.java index 6ba9ab8..2ef981d 100644 --- a/src/java/org/apache/cassandra/net/Verb.java +++ b/src/java/org/apache/cassandra/net/Verb.java @@ -329,7 +329,7 @@ public enum Verb } @VisibleForTesting - Supplier<? extends IVersionedAsymmetricSerializer<?, ?>> unsafeSetSerializer(Supplier<? extends IVersionedAsymmetricSerializer<?, ?>> serializer) throws NoSuchFieldException, IllegalAccessException + public Supplier<? extends IVersionedAsymmetricSerializer<?, ?>> unsafeSetSerializer(Supplier<? extends IVersionedAsymmetricSerializer<?, ?>> serializer) throws NoSuchFieldException, IllegalAccessException { Supplier<? extends IVersionedAsymmetricSerializer<?, ?>> original = this.serializer; Field field = Verb.class.getDeclaredField("serializer"); diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java index 44cef6f..2941668 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java @@ -55,6 +55,7 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Memtable; +import org.apache.cassandra.db.ReadResponse; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.SystemKeyspaceMigrator40; import org.apache.cassandra.db.commitlog.CommitLog; @@ -84,6 +85,7 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.net.Verb; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; import org.apache.cassandra.service.ActiveRepairService; @@ -383,6 +385,8 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance throw new RuntimeException(e); } + Verb.REQUEST_RSP.unsafeSetSerializer(() -> ReadResponse.serializer); + if (config.has(NETWORK)) { MessagingService.instance().listen(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org