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 f8b79ce93227b14f7b6c991695f169ca4fcd3f6e Merge: c591978 e920952 Author: Mick Semb Wever <[email protected]> AuthorDate: Fri Mar 19 18:10:27 2021 +0100 Merge branch 'cassandra-3.11' into trunk CHANGES.txt | 1 + build.xml | 46 ---------- .../cassandra/distributed/test/TestLocator.java | 99 ---------------------- 3 files changed, 1 insertion(+), 145 deletions(-) diff --cc CHANGES.txt index b700547,f7d8209..5cc6693 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -45,13 -5,9 +45,14 @@@ Merged from 3.0 * Refuse DROP COMPACT STORAGE if some 2.x sstables are in use (CASSANDRA-15897) * Fix ColumnFilter::toString not returning a valid CQL fragment (CASSANDRA-16483) * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades (CASSANDRA-16415) + * Update debian packaging for python3 (CASSANDRA-16396) * Avoid pushing schema mutations when setting up distributed system keyspaces locally (CASSANDRA-16387) + * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261) + * Improve empty hint file handling during startup (CASSANDRA-16162) + * Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226) + * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372) Merged from 2.2: + * Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests (CASSANDRA-16519) * Fix centos packaging for arm64, >=4.0 rpm's now require python3 (CASSANDRA-16477) * Make TokenMetadata's ring version increments atomic (CASSANDRA-16286) diff --cc build.xml index cad0044,68f7556..44af243 --- a/build.xml +++ b/build.xml @@@ -61,15 -64,8 +61,12 @@@ <property name="test.unit.src" value="${test.dir}/unit"/> <property name="test.long.src" value="${test.dir}/long"/> <property name="test.burn.src" value="${test.dir}/burn"/> + <property name="test.memory.src" value="${test.dir}/memory"/> <property name="test.microbench.src" value="${test.dir}/microbench"/> <property name="test.distributed.src" value="${test.dir}/distributed"/> + <property name="test.compression_algo" value="LZ4"/> + <property name="test.driver.connection_timeout_ms" value="5000"/> + <property name="test.driver.read_timeout_ms" value="12000"/> - <property name="test.distributed.listfile" value="ant-jvm-dtest-list"/> - <property name="test.distributed.upgrade.listfile" value="ant-jvm-dtest-upgrade-list"/> - <property name="test.distributed.upgrade.package" value="org.apache.cassandra.distributed.upgrade"/> <property name="dist.dir" value="${build.dir}/dist"/> <property name="tmp.dir" value="${java.io.tmpdir}"/> @@@ -2106,48 -1878,6 +2103,27 @@@ <property name="all-test-classes" refid="all-test-classes-path"/> <testparallel testdelegate="testlist-cdc"/> </target> + <target name="testclasslist-system-keyspace-directory" depends="build-test,get-cores,get-mem" description="Parallel-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="all-test-classes" refid="all-test-classes-path"/> + <testparallel testdelegate="testlist-system-keyspace-directory"/> + </target> + - <!-- In-JVM dtest targets --> - <target name="list-jvm-dtests" depends="build-test"> - <java classname="org.apache.cassandra.distributed.test.TestLocator" fork="no"> - <classpath> - <path refid="cassandra.classpath.test" /> - <pathelement location="${test.classes}"/> - <pathelement location="${test.conf}"/> - <fileset dir="${test.lib}"> - <include name="**/*.jar" /> - </fileset> - </classpath> - <arg value="${test.distributed.listfile}"/> - </java> - </target> - - <target name="test-jvm-dtest-forking" depends="list-jvm-dtests" description="Execute In-JVM 'distributed' tests" > - <chmod file="${test.distributed.listfile}" perm="+x"/> - <exec executable="./${test.distributed.listfile}" failonerror="true"/> - <delete file="${test.distributed.listfile}"/> - </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: [email protected] For additional commands, e-mail: [email protected]
