From a4f42ecdaf287fafb60a4ae97249c0b1346e958e Mon Sep 17 00:00:00 2001
From: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Date: Wed, 20 Nov 2024 16:26:28 -0500
Subject: [PATCH] Review feedback

---
 build.xml                 | 51 ++++++++++++++++++++-------------------
 conf/jvm-server.options   |  3 ---
 conf/jvm22-server.options | 14 +++--------
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/build.xml b/build.xml
index e42cb19e188e..d40bee8d5226 100644
--- a/build.xml
+++ b/build.xml
@@ -414,6 +414,7 @@
     <resources id="_jvm22_test_arg_items">
         <string>-Djava.security.manager=allow</string>
         <string>-Dio.netty.tryReflectionSetAccessible=true</string>
+        <string>-Dnet.bytebuddy.experimental=true"/></string>
 
         <!-- Enable vector incubator feature (simd support)-->
         <string>--add-modules jdk.incubator.vector</string>
@@ -606,7 +607,7 @@
         <jvmarg value="-Dstorage-config=${test.conf}"/>
         <jvmarg value="-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true" /> <!-- enable defensive checks -->
         <jvmarg value="-javaagent:${build.dir.lib}/jars/jamm-${jamm.version}.jar" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-ea"/>
         <jvmarg line="${java-jvmargs}"/>
       </java>
@@ -1288,7 +1289,7 @@
         <jvmarg value="-Dcassandra.use_nix_recursive_delete=${cassandra.use_nix_recursive_delete}"/>
         <jvmarg value="-Dio.netty.allocator.useCacheForAllThreads=true"/>
         <jvmarg value="-Dio.netty.allocator.maxOrder=11"/>
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg line="${java-jvmargs}"/>
         <!-- disable shrinks in quicktheories CASSANDRA-15554 -->
         <jvmarg value="-DQT_SHRINKS=0"/>
@@ -1340,7 +1341,7 @@
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
     <fileset dir="${test.unit.src}" />
   </target>
@@ -1359,7 +1360,7 @@
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
         <jvmarg value="-Xmx${maxMemory}"/>
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
       </testmacrohelper>
     </sequential>
@@ -1384,7 +1385,7 @@
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${compressed_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
       </testmacrohelper>
     </sequential>
@@ -1406,7 +1407,7 @@
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${cdc_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
       </testmacrohelper>
     </sequential>
@@ -1452,7 +1453,7 @@
         <jvmarg value="-Dcassandra.config=file:///${scm_none_yaml}"/>
         <jvmarg value="-Dcassandra.test.storage_compatibility_mode=NONE"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
       </testmacrohelper>
     </sequential>
@@ -1470,7 +1471,7 @@
                 <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
                 <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/>
                 <jvmarg value="-Dcassandra.skip_sync=true" />
-                <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
                 <jvmarg value="-Dcassandra.allow_cursor_compaction=false" />
                 <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
             </testmacrohelper>
@@ -1493,7 +1494,7 @@
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${system_keyspaces_directory_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
       </testmacrohelper>
     </sequential>
@@ -1510,7 +1511,7 @@
             <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
             <jvmarg value="-Dcassandra.sai.latest.version=aa"/>
             <jvmarg value="-Dcassandra.skip_sync=true" />
-            <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
             <jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
         </testmacrohelper>
     </sequential>
@@ -1526,7 +1527,7 @@
               <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
               <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
               <jvmarg value="-Dcassandra.skip_sync=true" />
-              <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
               <jvmarg value="-Dlogback.configurationFile=file://\${test.logback.configurationFile}"/>
           </testmacrohelper>
       </sequential>
@@ -1557,7 +1558,7 @@
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1571,7 +1572,7 @@
       <test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1584,7 +1585,7 @@
       <test if="withMethods" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/>
       <test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-burntest.xml"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1665,21 +1666,21 @@
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.test-serialization-writes=True"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
   <target name="msg-ser-test" depends="maybe-build-test" description="Tests message serializations">
       <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
                filter="**/SerializationsTest.java"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
   </target>
 
   <target name="msg-ser-test-7" depends="maybe-build-test" description="Generates message serializations">
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=0.7"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1687,7 +1688,7 @@
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=1.0"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1702,7 +1703,7 @@
                timeout="${test.long.timeout}">
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -1710,7 +1711,7 @@
       <testmacro inputdir="${test.memory.src}"
                  timeout="${test.memory.timeout}">
           <jvmarg value="-javaagent:${build.dir}/test/lib/jars/java-allocation-instrumenter-${allocation-instrumenter.version}.jar"/>
-          <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
       </testmacro>
   </target>
 
@@ -1729,7 +1730,7 @@
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <classpath>
           <path refid="cassandra.classpath.test" />
           <pathelement location="${test.classes}"/>
@@ -1776,7 +1777,7 @@
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
-        <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
         <classpath>
           <path refid="cassandra.classpath.test" />
           <pathelement location="${test.classes}"/>
@@ -2011,7 +2012,7 @@
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -2049,7 +2050,7 @@
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
       <jvmarg value="-Xmx8G"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
@@ -2066,7 +2067,7 @@
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
       <jvmarg value="-Xmx8G"/>
-      <jvmarg value="-Dnet.bytebuddy.experimental=true"/>
+
     </testmacro>
   </target>
 
diff --git a/conf/jvm-server.options b/conf/jvm-server.options
index 94b50c89bd0a..c50f3631f5a0 100644
--- a/conf/jvm-server.options
+++ b/conf/jvm-server.options
@@ -171,9 +171,6 @@
 #-Xms4G
 #-Xmx4G
 
-# Need experimental bytebuddy for JDK21
--Dnet.bytebuddy.experimental
-
 # Young generation size is automatically calculated by cassandra-env
 # based on this formula: min(100 * num_cores, 1/4 * heap size)
 #
diff --git a/conf/jvm22-server.options b/conf/jvm22-server.options
index ffc25640a2ea..236ca90f0968 100644
--- a/conf/jvm22-server.options
+++ b/conf/jvm22-server.options
@@ -40,6 +40,7 @@
 ### JPMS
 
 -Djdk.attach.allowAttachSelf=true
+-Djava.security.manager=allow
 --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
 --add-exports java.base/jdk.internal.perf=ALL-UNNAMED
@@ -59,6 +60,7 @@
 --add-opens java.base/java.nio=ALL-UNNAMED
 --add-opens java.base/java.net=ALL-UNNAMED
 --add-opens java.base/java.util=ALL-UNNAMED
+--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED
 --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED
 --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
 --add-opens java.base/jdk.internal.math=ALL-UNNAMED
@@ -66,6 +68,7 @@
 --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
 --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
 --add-opens java.base/jdk.internal.vm=ALL-UNNAMED
+--add-opens java.base/sun.nio.ch=ALL-UNNAMED
 --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
 --add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED
 --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
@@ -74,8 +77,6 @@
 # required for org.apache.cassandra.Util.getSupportedMTimeGranularity
 --add-opens java.base/java.nio.file.attribute=ALL-UNNAMED
 
---add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
-
 ### GC logging options -- uncomment to enable
 
 # Java 11 (and newer) GC logging options:
@@ -105,13 +106,4 @@
 
 --add-modules jdk.incubator.vector
 
-### Compatibility Options
---add-opens java.base/java.io=ALL-UNNAMED
---add-opens java.base/java.lang=ALL-UNNAMED
---add-opens java.base/java.nio=ALL-UNNAMED
---add-opens java.base/java.util=ALL-UNNAMED
---add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED
---add-opens java.base/sun.nio.ch=ALL-UNNAMED
--Djava.security.manager=allow
-
 # The newline in the end of file is intentional