From 9f4368cbb74d7163b6396eec3722b8c1d7fb55dc Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <smiklosovic@apache.org>
Date: Thu, 7 Sep 2023 16:31:09 +0200
Subject: [PATCH] Set io.netty.transport.noNative to false for in-jvm dtests

patch by Stefan Miklosovic; reviewed by Brandon Williams from CASSANDRA-18830
---
 .../apache/cassandra/config/CassandraRelevantProperties.java    | 1 +
 .../org/apache/cassandra/distributed/impl/AbstractCluster.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index a8b22994ad..22a8a03bff 100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -269,6 +269,7 @@ public enum CassandraRelevantProperties
     INTERNODE_EVENT_THREADS("cassandra.internode-event-threads"),
     IO_NETTY_EVENTLOOP_THREADS("io.netty.eventLoopThreads"),
     IO_NETTY_TRANSPORT_ESTIMATE_SIZE_ON_SUBMIT("io.netty.transport.estimateSizeOnSubmit"),
+    IO_NETTY_TRANSPORT_NONATIVE("io.netty.transport.noNative"),
     JAVAX_RMI_SSL_CLIENT_ENABLED_CIPHER_SUITES("javax.rmi.ssl.client.enabledCipherSuites"),
     JAVAX_RMI_SSL_CLIENT_ENABLED_PROTOCOLS("javax.rmi.ssl.client.enabledProtocols"),
     /** Java class path. */
diff --git a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index 70ebad3daf..73e63a8b81 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@ -193,7 +193,7 @@ public abstract class AbstractCluster<I extends IInstance> implements ICluster<I
             // those properties may be set for unit-test optimizations; those should not be used when running dtests
             CassandraRelevantProperties.TEST_FLUSH_LOCAL_SCHEMA_CHANGES.reset();
             CassandraRelevantProperties.NON_GRACEFUL_SHUTDOWN.reset();
-            CassandraRelevantProperties.NATIVE_EPOLL_ENABLED.setBoolean(false);
+            CassandraRelevantProperties.IO_NETTY_TRANSPORT_NONATIVE.setBoolean(false);
         }
 
         public AbstractBuilder(Factory<I, C, B> factory)