Skip to content

Commit 6fd2581

Browse files
ekaterinadimitrova2djatnieks
ekaterinadimitrova2
authored and
djatnieks
committed
CNDB-11508: Add config to enable JDK22 test and run (#1503)
1 parent aa2211b commit 6fd2581

File tree

11 files changed

+331
-21
lines changed

11 files changed

+331
-21
lines changed

‎bin/cassandra.in.sh‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,16 @@ jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR=
122122
JVM_VERSION=${jvmver%_*}
123123
short=$(echo "${jvmver}" | cut -c1-2)
124124

125-
JAVA_VERSION=17
125+
JAVA_VERSION=22
126126
if [ "$short" = "11" ] ; then
127127
JAVA_VERSION=11
128128
elif [ "$JVM_VERSION" \< "17" ] ; then
129-
echo "DSE DB 5.0 requires Java 11 or Java 17."
129+
echo "DSE DB 5.0 requires Java 11 or higher."
130+
exit 1;
131+
elif [ "$short" = "17" ] ; then
132+
JAVA_VERSION=17
133+
elif [ "$JVM_VERSION" \< "22" ] ; then
134+
echo "DSE DB 5.0 requires Java 11 or higher."
130135
exit 1;
131136
fi
132137

@@ -151,7 +156,9 @@ esac
151156

152157
# Read user-defined JVM options from jvm-server.options file
153158
JVM_OPTS_FILE=$CASSANDRA_CONF/jvm${jvmoptions_variant:--clients}.options
154-
if [ $JAVA_VERSION -ge 17 ] ; then
159+
if [ $JAVA_VERSION -ge 22 ] ; then
160+
JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm22${jvmoptions_variant:--clients}.options
161+
elif [ $JAVA_VERSION -ge 17 ] ; then
155162
JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm17${jvmoptions_variant:--clients}.options
156163
elif [ $JAVA_VERSION -ge 11 ] ; then
157164
JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm11${jvmoptions_variant:--clients}.options

‎build.xml‎

Lines changed: 116 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@
4242
All releases are built with the default JDK.
4343
Builds with non-default JDKs are considered experimental and for development and testing purposes.
4444
When building, javac's source and target flags are set to the jdk used, so lower JDKs are not supported at runtime.
45-
The use of both CASSANDRA_USE_JDK11 and use-jdk11 is deprecated.
4645
-->
4746
<property name="java.default" value="11" />
48-
<property name="java.supported" value="11,17" />
47+
<property name="java.supported" value="11,17,22" />
4948

5049
<!-- directory details -->
5150
<property name="basedir" value="."/>
@@ -313,6 +312,7 @@
313312
<string>--add-opens java.base/java.lang=ALL-UNNAMED</string>
314313
<string>--add-opens java.base/java.util=ALL-UNNAMED</string>
315314
<string>--add-opens java.base/java.nio=ALL-UNNAMED</string>
315+
<string>--add-opens java.base/java.nio.file.attribute=ALL-UNNAMED</string>
316316

317317
<string>--add-opens java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED</string>
318318
</resources>
@@ -321,6 +321,77 @@
321321
<equals arg1="${ant.java.version}" arg2="17"/>
322322
</condition>
323323

324+
<resources id="_jvm22_arg_items">
325+
<string>-XX:+UnlockDiagnosticVMOptions</string>
326+
<string>-Djdk.attach.allowAttachSelf=true</string>
327+
<string>-XX:+UseG1GC</string>
328+
<string>-XX:+ParallelRefProcEnabled</string>
329+
<!-- Below two are used in Cassandra, not in CNDB-->
330+
<!--<string>-XX:MaxTenuringThreshold=1</string>
331+
<string>-XX:G1HeapRegionSize=16m</string>-->
332+
<string>-XX:G1RSetUpdatingPauseTimePercent=5</string>
333+
<string>-XX:MaxGCPauseMillis=100</string>
334+
335+
<!-- Copy-paste for now these options from cndb/docker-entrypoint.sh; we will verify later whether we
336+
want all of them for tests-->
337+
<string>-XX:-RestrictContended</string>
338+
<string>-XX:+UseThreadPriorities</string>
339+
<string>-XX:+DebugNonSafepoints</string>
340+
<string>-XX:+UseStringDeduplication</string>
341+
<string>-XX:StringTableSize=1000003</string>
342+
<string>-XX:+PerfDisableSharedMem</string>
343+
<string>-XX:+AlwaysPreTouch</string>
344+
<string>-XX:+UseTLAB</string>
345+
<string>-XX:+ResizeTLAB</string>
346+
<string>-XX:+UseNUMA</string>
347+
348+
349+
<string>--add-exports java.base/jdk.internal.misc=ALL-UNNAMED</string>
350+
<string>--add-exports java.base/jdk.internal.ref=ALL-UNNAMED</string>
351+
<string>--add-exports java.base/jdk.internal.perf=ALL-UNNAMED</string>
352+
<string>--add-exports java.base/sun.nio.ch=ALL-UNNAMED</string>
353+
<string>--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED</string>
354+
<string>--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED</string>
355+
<string>--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED</string>
356+
<string>--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</string>
357+
<string>--add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming</string>
358+
<string>--add-exports jdk.unsupported/sun.misc=ALL-UNNAMED</string>
359+
360+
<string>--add-opens java.base/java.io=ALL-UNNAMED</string>
361+
<string>--add-opens java.base/java.lang=ALL-UNNAMED</string>
362+
<string>--add-opens java.base/java.lang.module=ALL-UNNAMED</string>
363+
<string>--add-opens java.base/java.lang.ref=ALL-UNNAMED</string>
364+
<string>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</string>
365+
<string>--add-opens java.base/java.math=ALL-UNNAMED</string>
366+
<string>--add-opens java.base/java.net=ALL-UNNAMED</string>
367+
<string>--add-opens java.base/java.nio=ALL-UNNAMED</string>
368+
<string>--add-opens java.base/java.nio.file.spi=ALL-UNNAMED</string>
369+
<string>--add-opens java.base/java.util=ALL-UNNAMED</string>
370+
<string>--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED</string>
371+
<string>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED</string>
372+
<string>--add-opens java.base/jdk.internal.math=ALL-UNNAMED</string>
373+
<string>--add-opens java.base/jdk.internal.module=ALL-UNNAMED</string>
374+
<string>--add-opens java.base/jdk.internal.ref=ALL-UNNAMED</string>
375+
<string>--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED</string>
376+
<string>--add-opens java.base/jdk.internal.vm=ALL-UNNAMED</string>
377+
<string>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</string>
378+
<string>--add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED</string>
379+
<string>--add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED</string>
380+
<string>--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED</string>
381+
<string>--add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED</string>
382+
<!-- required for org.apache.cassandra.Util.getSupportedMTimeGranularity-->
383+
<string>--add-opens java.base/java.nio.file.attribute=ALL-UNNAMED</string>
384+
385+
<!-- below 2 were added to support jamm and fix BatchCommitLogTest -->
386+
<string>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</string>
387+
<string>--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED</string>
388+
<string>--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED</string>
389+
</resources>
390+
<pathconvert property="_jvm22_args_concat" refid="_jvm22_arg_items" pathsep=" "/>
391+
<condition property="java-jvmargs" value="${_jvm22_args_concat}">
392+
<equals arg1="${ant.java.version}" arg2="22"/>
393+
</condition>
394+
324395
<!--
325396
JVM arguments for tests.
326397
@@ -348,6 +419,21 @@
348419
<condition property="_std-test-jvmargs" value="${_jvm17_test_arg_items_concat}">
349420
<equals arg1="${ant.java.version}" arg2="17"/>
350421
</condition>
422+
<resources id="_jvm22_test_arg_items">
423+
<string>-Djava.security.manager=allow</string>
424+
<string>-Dio.netty.tryReflectionSetAccessible=true</string>
425+
<string>-Dnet.bytebuddy.experimental=true</string>
426+
427+
<!-- Enable vector incubator feature (simd support)-->
428+
<string>--add-modules jdk.incubator.vector</string>
429+
</resources>
430+
<pathconvert property="_jvm22_test_arg_items_concat" refid="_jvm22_test_arg_items" pathsep=" "/>
431+
<condition property="_std-test-jvmargs" value="${_jvm11_test_arg_items_concat}">
432+
<equals arg1="${ant.java.version}" arg2="11"/>
433+
</condition>
434+
<condition property="_std-test-jvmargs" value="${_jvm22_test_arg_items_concat}">
435+
<equals arg1="${ant.java.version}" arg2="22"/>
436+
</condition>
351437

352438
<!-- needed to compile org.apache.cassandra.utils.JMXServerUtils -->
353439
<!-- needed to compile org.apache.cassandra.distributed.impl.Instance-->
@@ -529,6 +615,7 @@
529615
<jvmarg value="-Dstorage-config=${test.conf}"/>
530616
<jvmarg value="-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true" /> <!-- enable defensive checks -->
531617
<jvmarg value="-javaagent:${build.dir.lib}/jars/jamm-${jamm.version}.jar" />
618+
532619
<jvmarg value="-ea"/>
533620
<jvmarg line="${java-jvmargs}"/>
534621
</java>
@@ -1212,6 +1299,7 @@
12121299
<jvmarg value="-Dcassandra.use_nix_recursive_delete=${cassandra.use_nix_recursive_delete}"/>
12131300
<jvmarg value="-Dio.netty.allocator.useCacheForAllThreads=true"/>
12141301
<jvmarg value="-Dio.netty.allocator.maxOrder=11"/>
1302+
12151303
<jvmarg line="${java-jvmargs}"/>
12161304
<!-- disable shrinks in quicktheories CASSANDRA-15554 -->
12171305
<jvmarg value="-DQT_SHRINKS=0"/>
@@ -1263,6 +1351,7 @@
12631351
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
12641352
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
12651353
<jvmarg value="-Dcassandra.skip_sync=true" />
1354+
12661355
</testmacro>
12671356
<fileset dir="${test.unit.src}" />
12681357
</target>
@@ -1281,6 +1370,7 @@
12811370
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
12821371
<jvmarg value="-Dcassandra.skip_sync=true" />
12831372
<jvmarg value="-Xmx${maxMemory}"/>
1373+
12841374
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
12851375
</testmacrohelper>
12861376
</sequential>
@@ -1305,6 +1395,7 @@
13051395
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
13061396
<jvmarg value="-Dcassandra.config=file:///${compressed_yaml}"/>
13071397
<jvmarg value="-Dcassandra.skip_sync=true" />
1398+
13081399
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
13091400
</testmacrohelper>
13101401
</sequential>
@@ -1326,6 +1417,7 @@
13261417
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
13271418
<jvmarg value="-Dcassandra.config=file:///${cdc_yaml}"/>
13281419
<jvmarg value="-Dcassandra.skip_sync=true" />
1420+
13291421
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
13301422
</testmacrohelper>
13311423
</sequential>
@@ -1371,6 +1463,7 @@
13711463
<jvmarg value="-Dcassandra.config=file:///${scm_none_yaml}"/>
13721464
<jvmarg value="-Dcassandra.test.storage_compatibility_mode=NONE"/>
13731465
<jvmarg value="-Dcassandra.skip_sync=true" />
1466+
13741467
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
13751468
</testmacrohelper>
13761469
</sequential>
@@ -1388,6 +1481,7 @@
13881481
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
13891482
<jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/>
13901483
<jvmarg value="-Dcassandra.skip_sync=true" />
1484+
13911485
<jvmarg value="-Dcassandra.allow_cursor_compaction=false" />
13921486
<jvmarg value="-Dunified_compaction.parallelize_output_shards=false" />
13931487
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
@@ -1411,6 +1505,7 @@
14111505
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
14121506
<jvmarg value="-Dcassandra.config=file:///${system_keyspaces_directory_yaml}"/>
14131507
<jvmarg value="-Dcassandra.skip_sync=true" />
1508+
14141509
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
14151510
</testmacrohelper>
14161511
</sequential>
@@ -1427,6 +1522,7 @@
14271522
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
14281523
<jvmarg value="-Dcassandra.sai.latest.version=aa"/>
14291524
<jvmarg value="-Dcassandra.skip_sync=true" />
1525+
14301526
<jvmarg value="-Dlogback.configurationFile=file://${test.logback.configurationFile}"/>
14311527
</testmacrohelper>
14321528
</sequential>
@@ -1442,6 +1538,7 @@
14421538
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
14431539
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
14441540
<jvmarg value="-Dcassandra.skip_sync=true" />
1541+
14451542
<jvmarg value="-Dlogback.configurationFile=file://\${test.logback.configurationFile}"/>
14461543
</testmacrohelper>
14471544
</sequential>
@@ -1472,6 +1569,7 @@
14721569
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
14731570
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
14741571
<jvmarg value="-Dcassandra.skip_sync=true" />
1572+
14751573
</testmacro>
14761574
</target>
14771575

@@ -1485,6 +1583,7 @@
14851583
<test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
14861584
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
14871585
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
1586+
14881587
</testmacro>
14891588
</target>
14901589

@@ -1497,6 +1596,7 @@
14971596
<test if="withMethods" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/>
14981597
<test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
14991598
<jvmarg value="-Dlogback.configurationFile=test/conf/logback-burntest.xml"/>
1599+
15001600
</testmacro>
15011601
</target>
15021602

@@ -1577,25 +1677,29 @@
15771677
<testmacro inputdir="${test.unit.src}"
15781678
timeout="${test.timeout}" filter="**/SerializationsTest.java">
15791679
<jvmarg value="-Dcassandra.test-serialization-writes=True"/>
1680+
15801681
</testmacro>
15811682
</target>
15821683

15831684
<target name="msg-ser-test" depends="maybe-build-test" description="Tests message serializations">
15841685
<testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
15851686
filter="**/SerializationsTest.java"/>
1687+
15861688
</target>
15871689

15881690
<target name="msg-ser-test-7" depends="maybe-build-test" description="Generates message serializations">
15891691
<testmacro inputdir="${test.unit.src}"
15901692
timeout="${test.timeout}" filter="**/SerializationsTest.java">
15911693
<jvmarg value="-Dcassandra.version=0.7"/>
1694+
15921695
</testmacro>
15931696
</target>
15941697

15951698
<target name="msg-ser-test-10" depends="maybe-build-test" description="Tests message serializations on 1.0 messages">
15961699
<testmacro inputdir="${test.unit.src}"
15971700
timeout="${test.timeout}" filter="**/SerializationsTest.java">
15981701
<jvmarg value="-Dcassandra.version=1.0"/>
1702+
15991703
</testmacro>
16001704
</target>
16011705

@@ -1610,13 +1714,15 @@
16101714
timeout="${test.long.timeout}">
16111715
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
16121716
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
1717+
16131718
</testmacro>
16141719
</target>
16151720

16161721
<target name="test-memory" depends="maybe-build-test" description="Execute functional tests">
16171722
<testmacro inputdir="${test.memory.src}"
16181723
timeout="${test.memory.timeout}">
16191724
<jvmarg value="-javaagent:${build.dir}/test/lib/jars/java-allocation-instrumenter-${allocation-instrumenter.version}.jar"/>
1725+
16201726
</testmacro>
16211727
</target>
16221728

@@ -1635,6 +1741,7 @@
16351741
<jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
16361742
<jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
16371743
<jvmarg value="-Dcassandra.skip_sync=true" />
1744+
16381745
<classpath>
16391746
<path refid="cassandra.classpath.test" />
16401747
<pathelement location="${test.classes}"/>
@@ -1681,6 +1788,7 @@
16811788
<jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
16821789
<jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
16831790
<jvmarg value="-Dcassandra.skip_sync=true" />
1791+
16841792
<classpath>
16851793
<path refid="cassandra.classpath.test" />
16861794
<pathelement location="${test.classes}"/>
@@ -1915,6 +2023,7 @@
19152023
<jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
19162024
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
19172025
<jvmarg value="-Dcassandra.skip_sync=true" />
2026+
19182027
</testmacro>
19192028
</target>
19202029

@@ -1952,6 +2061,7 @@
19522061
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
19532062
<jvmarg value="-Dcassandra.skip_sync=true" />
19542063
<jvmarg value="-Xmx8G"/>
2064+
19552065
</testmacro>
19562066
</target>
19572067

@@ -1968,6 +2078,7 @@
19682078
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
19692079
<jvmarg value="-Dcassandra.skip_sync=true" />
19702080
<jvmarg value="-Xmx8G"/>
2081+
19712082
</testmacro>
19722083
</target>
19732084

@@ -2086,10 +2197,10 @@
20862197
</project>]]></echo>
20872198
<antcall target="_maybe_update_idea_to_java11plus"/>
20882199
<echo>
2089-
IDE configuration in .idea/ updated for use with JDK${ant.java.version}.
2200+
IDE configuration in .idea/ updated for use with JDK${ant.java.version}.
20902201

2091-
In IntelliJ verify that the SDK is ${ant.java.version}, and its path is valid.
2092-
This can be verified in 'Project Structure/Project Setting/Project' and 'Project Structure/Platform Setting/SDKs'.
2202+
In IntelliJ verify that the SDK is ${ant.java.version}, and its path is valid.
2203+
This can be verified in 'Project Structure/Project Setting/Project' and 'Project Structure/Platform Setting/SDKs'.
20932204
</echo>
20942205
</target>
20952206

‎conf/jvm17-server.options‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,15 @@
9292
--add-opens java.base/java.nio=ALL-UNNAMED
9393
--add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
9494

95+
# required for org.apache.cassandra.Util.getSupportedMTimeGranularity
96+
--add-opens java.base/java.nio.file.attribute=ALL-UNNAMED
97+
9598
### GC logging options -- uncomment to enable
9699

97100
# Java 11 (and newer) GC logging options:
98101
# See description of https://bugs.openjdk.java.net/browse/JDK-8046148 for details about the syntax
99102
# The following is the equivalent to -XX:+PrintGCDetails -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M
100-
-Xlog:gc=info,heap*=debug,age*=debug,safepoint=info,promotion*=debug:file=/var/log/cassandra/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760
103+
# -Xlog:gc=info,heap*=debug,age*=debug,safepoint=info,promotion*=debug:file=/var/log/cassandra/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760
101104

102105
# Notes for Java 8 migration:
103106
#

0 commit comments

Comments
 (0)