This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 65b6dfa822b0ea207787790bff5acbb5d4008348 Merge: b915688 cca5ce5 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Fri Apr 16 00:43:30 2021 +0200 Merge branch 'cassandra-3.11' into trunk build.xml | 100 ++++++++++++-------- .../cassandra/OffsetAwareConfigurationLoader.java | 105 --------------------- .../config/DatabaseDescriptorRefTest.java | 1 - 3 files changed, 61 insertions(+), 145 deletions(-) diff --cc build.xml index c9f09f6,b773f0f..31c1fe9 --- a/build.xml +++ b/build.xml @@@ -1351,12 -1359,10 +1387,11 @@@ algorithm to limit the metaspace size and clean up SoftReferences more aggressively rather than waiting. See CASSANDRA-14922 for more details. --> - <jvmarg value="-XX:MaxMetaspaceSize=384M" /> <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" /> + <jvmarg value="-Dcassandra.test.driver.connection_timeout_ms=${test.driver.connection_timeout_ms}"/> + <jvmarg value="-Dcassandra.test.driver.read_timeout_ms=${test.driver.read_timeout_ms}"/> <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/> <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/> - <jvmarg value="-Dcassandra.test.offsetseed=@{poffset}"/> <jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/> <!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random --> <jvmarg value="-Djava.security.egd=file:/dev/urandom" /> @@@ -1392,20 -1389,11 +1427,12 @@@ </batchtest> </junit-timeout> - <condition property="fileSep" value=";"> - <os family="windows"/> - </condition> - <condition property="fileSep" else=":"> - <isset property="fileSep"/> - </condition> - <fail unless="fileSep">Failed to set File Separator. This shouldn't happen.</fail> - - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog${fileSep}@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/cdc_raw${fileSep}@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data${fileSep}@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/system_data${fileSep}@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches${fileSep}@{poffset}"/> - <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/hints${fileSep}@{poffset}"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/cdc_raw"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data"/> ++ <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/system_data"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches"/> + <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/hints"/> </sequential> </macrodef> @@@ -1427,9 -1416,9 +1454,8 @@@ <testmacrohelper inputdir="${test.dir}/${test.classlistprefix}" filelist="@{test.file.list}" exclude="**/*.java" timeout="${test.timeout}"> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> - <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/> <jvmarg value="-Dcassandra.skip_sync=true" /> </testmacrohelper> </sequential> @@@ -1479,27 -1468,6 +1503,26 @@@ </sequential> </macrodef> + <macrodef name="testlist-system-keyspace-directory"> + <attribute name="test.file.list" /> + <sequential> + <property name="system_keyspaces_directory_yaml" value="${build.test.dir}/cassandra.system.yaml"/> + <concat destfile="${system_keyspaces_directory_yaml}"> + <fileset file="${test.conf}/cassandra.yaml"/> + <fileset file="${test.conf}/system_keyspaces_directory.yaml"/> + </concat> + <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}" + exclude="**/*.java" timeout="${test.timeout}" testtag="system_keyspace_directory"> + <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> + <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> + <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> + <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> + <jvmarg value="-Dcassandra.config=file:///${system_keyspaces_directory_yaml}"/> + <jvmarg value="-Dcassandra.skip_sync=true" /> - <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/> + </testmacrohelper> + </sequential> + </macrodef> + <!-- Run named ant task with jacoco, such as "ant jacoco-run -Dtaskname=test" the target run must enable the jacoco agent if usejacoco is 'yes' --> @@@ -1563,18 -1516,10 +1586,18 @@@ <path id="all-test-classes-path"> <fileset dir="${test.unit.src}" includes="**/${test.name}.java" /> </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist-cdc test.file.list="${test.file.list}"/> + <property name="all-test-classes" refid="all-test-classes-path"/> + <testhelper testdelegate="testlist-cdc" /> </target> + <target name="test-system-keyspace-directory" depends="build-test" description="Execute unit tests with a system keyspaces directory configured"> + <path id="all-test-classes-path"> + <fileset dir="${test.unit.src}" includes="**/${test.name}.java" /> + </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist-system-keyspace-directory test.file.list="${test.file.list}"/> ++ <property name="all-test-classes" refid="all-test-classes-path"/> ++ <testhelper testdelegate="testlist-system-keyspace-directory" /> + </target> + <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations"> <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}" filter="**/SerializationsTest.java"> @@@ -1831,44 -1779,25 +1853,44 @@@ <path id="all-test-classes-path"> <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/> </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist test.file.list="${test.file.list}"/> + <property name="all-test-classes" refid="all-test-classes-path"/> + <testhelper testdelegate="testlist"/> </target> - <target name="testclasslist-compression" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)"> <path id="all-test-classes-path"> <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/> </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist-compression test.file.list="${test.file.list}"/> + <property name="all-test-classes" refid="all-test-classes-path"/> + <testhelper testdelegate="testlist-compression"/> </target> - <target name="testclasslist-cdc" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)"> <path id="all-test-classes-path"> <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/> </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist-cdc test.file.list="${test.file.list}"/> + <property name="all-test-classes" refid="all-test-classes-path"/> + <testhelper testdelegate="testlist-cdc"/> </target> + <target name="testclasslist-system-keyspace-directory" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)"> + <path id="all-test-classes-path"> + <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/> + </path> - <property name="test.file.list" refid="all-test-classes-path"/> - <testlist-system-keyspace-directory test.file.list="${test.file.list}"/> ++ <property name="all-test-classes" refid="all-test-classes-path"/> ++ <testhelper testdelegate="testlist-system-keyspace-directory"/> + </target> + + <!-- Build a self-contained jar for e.g. remote execution; not currently used for running burn tests with this build script --> + <target name="burn-test-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies"> + <jar jarfile="${build.dir}/burntest.jar"> + <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/> + <fileset dir="${build.classes.main}"/> + <fileset dir="${test.classes}"/> + <fileset dir="${test.conf}" excludes="logback*.xml"/> + <fileset dir="${basedir}/conf" includes="logback*.xml"/> + <zipgroupfileset dir="${build.dir.lib}/jars"> + <include name="junit*.jar"/> + </zipgroupfileset> + </jar> + </target> <target name="dtest-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies"> <jar jarfile="${build.dir}/dtest-${base.version}.jar"> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org