This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1ee18ac22d60c6608456f6cdac23eb37dd1ed5e6
Merge: 32394e9 730e89e
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Fri Mar 19 17:36:39 2021 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 1 +
build.xml | 46 ----------
.../cassandra/distributed/test/TestLocator.java | 99 ----------------------
3 files changed, 1 insertion(+), 145 deletions(-)
diff --cc CHANGES.txt
index 8cf7f32,5199140..c425c25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,7 +1,33 @@@
-2.2.20
+3.0.25:
+ * Ignore trailing zeros in hint files (CASSANDRA-16523)
+ * 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)
+ * Avoid pushing schema mutations when setting up distributed system
keyspaces locally (CASSANDRA-16387)
+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)
+
+
+3.0.24:
+ * Prevent unbounded number of pending flushing tasks; Add PendingFlushTasks
metric (CASSANDRA-16261)
+ * Improve empty hint file handling during startup (CASSANDRA-16162)
+ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
+ * Fix skipping on pre-3.0 created compact storage sstables due to missing
primary key liveness (CASSANDRA-16226)
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
+ * Extend the exclusion of replica filtering protection to other indices
instead of just SASI (CASSANDRA-16311)
+ * Synchronize transaction logs for JBOD (CASSANDRA-16225)
+ * Fix the counting of cells per partition (CASSANDRA-16259)
+ * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
+ * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
+ * Improved check of num_tokens against the length of initial_token
(CASSANDRA-14477)
+ * Fix a race condition on ColumnFamilyStore and TableMetrics
(CASSANDRA-16228)
+ * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
+ * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
+ * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+ * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+Merged from 2.2:
* Remove OpenJDK log warning (CASSANDRA-15563)
* Fix the histogram merge of the table metrics (CASSANDRA-16259)
diff --cc build.xml
index 4f1f32e,1b54943..ad40e59
--- a/build.xml
+++ b/build.xml
@@@ -64,16 -65,16 +64,13 @@@
<property name="test.long.src" value="${test.dir}/long"/>
<property name="test.burn.src" value="${test.dir}/burn"/>
<property name="test.microbench.src" value="${test.dir}/microbench"/>
- <property name="test.pig.src" value="${test.dir}/pig"/>
<property name="test.distributed.src" value="${test.dir}/distributed"/>
- <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}"/>
-
+
<property name="source.version" value="1.8"/>
- <property name="source.test.version" value="1.8"/>
<property name="target.version" value="1.8"/>
- <property name="target.test.version" value="1.8"/>
-
+
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@@@ -1816,35 -1846,27 +1813,14 @@@
<property name="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist"/>
</target>
- <target name="testclasslist-compression" depends="build-test"
description="Parallel-run compression 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.unit.src}" includesfile="${test.classlistfile}"/>
- </path>
- <property name="all-test-classes" refid="all-test-classes-path"/>
- <testparallel testdelegate="testlist-compression"/>
- </target>
-
- <target name="test-distributed" depends="build-test" description="Execute
unit tests">
- <testmacro inputdir="${test.distributed.src}"
timeout="${test.distributed.timeout}" forkmode="once" showoutput="true"
filter="**/test/*Test.java">
- <jvmarg
value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
- <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
- <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
- <jvmarg value="-Dcassandra.skip_sync=true" />
- <jvmarg value="-XX:MaxMetaspaceSize=256M" />
- <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <jvmarg value="-XX:HeapDumpPath=build/test/oom.hprof" />
- </testmacro>
+ <target name="testclasslist-compression" depends="build-test"
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-compression"/>
</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" />
- <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>
-
<target name="dtest-jar" depends="build-test, build" description="Create
dtest-compatible jar, including all dependencies">
<jar jarfile="${build.dir}/dtest-${base.version}.jar">
<zipgroupfileset dir="${build.lib}" includes="*.jar"
excludes="META-INF/*.SF"/>
@@@ -1864,38 -1886,6 +1840,16 @@@
</testmacro>
</target>
- <!-- In-JVM upgrade dtests -->
- <target name="list-jvm-upgrade-dtests" depends="build-test">
- <java classname="org.apache.cassandra.distributed.test.TestLocator"
fork="no">
- <classpath>
- <path refid="cassandra.classpath" />
- <pathelement location="${test.classes}"/>
- <pathelement location="${test.conf}"/>
- <fileset dir="${test.lib}">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <arg value="${test.distributed.upgrade.listfile}"/>
- <arg value="${test.distributed.upgrade.package}"/>
- </java>
- </target>
-
- <target name="test-jvm-upgrade-dtest-forking"
depends="list-jvm-upgrade-dtests" description="Execute In-JVM 'distributed'
upgrade tests" >
- <chmod file="${test.distributed.upgrade.listfile}" perm="+x"/>
- <exec executable="./${test.distributed.upgrade.listfile}"
failonerror="true"/>
- <delete file="${test.distributed.upgrade.listfile}"/>
- </target>
-
+ <target name="test-jvm-upgrade-dtest" depends="build-test"
description="Execute in-jvm dtests">
+ <testmacro inputdir="${test.distributed.src}"
timeout="${test.distributed.timeout}" forkmode="once" showoutput="true"
filter="**/upgrade/*Test.java">
+ <jvmarg
value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
+ <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+ <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+ <jvmarg value="-Dcassandra.skip_sync=true" />
+ <jvmarg value="-XX:MaxMetaspaceSize=512M"/>
+ </testmacro>
+ </target>
+
<!-- Use this with an FQDN for test class, and a csv list of methods like
this:
ant test-jvm-dtest-some
-Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest
-Dtest.methods=looperTest
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
