natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Mick Semb Wever 2021-04-15 13:05:40 +02:00
parent c7293183c3 2a6059ef4a
commit 5b93a87a6f
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 25 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
build.xml
View File

@ -1282,8 +1282,7 @@
<!-- Defines how to run a set of tests. If you change the defaults for attributes
you should also update them in testmacro.,
The two are split because the helper doesn't generate
a junit report or fail on errors, since this is called in parallel to run tests
when we choose to run tests in parallel -->
a junit report or fail on errors -->
<macrodef name="testmacrohelper">
<attribute name="inputdir" />
<attribute name="timeout" default="${test.timeout}" />
@ -1383,13 +1382,11 @@
<fileset dir="${test.unit.src}" />
</target>
<!-- Will not generate a junit report or fail on error since it is called in parallel for test-compression
That is taken care of by testparallel -->
<!-- Will not generate a junit report or fail on error -->
<macrodef name="testlist">
<attribute name="test.file.list"/>
<attribute name="testlist.offset"/>
<sequential>
<testmacrohelper inputdir="${test.dir}/${test.classlistprefix}" filelist="@{test.file.list}" poffset="@{testlist.offset}" exclude="**/*.java" timeout="${test.timeout}">
<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"/>
@ -1401,18 +1398,16 @@
</sequential>
</macrodef>
<!-- Will not generate a junit report or fail on error since it is called in parallel for test-compression
That is taken care of by testparallel -->
<!-- Will not generate a junit report -->
<macrodef name="testlist-compression">
<attribute name="test.file.list" />
<attribute name="testlist.offset" />
<sequential>
<property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
<concat destfile="${compressed_yaml}">
<fileset file="${test.conf}/cassandra.yaml"/>
<fileset file="${test.conf}/commitlog_compression.yaml"/>
</concat>
<testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}" poffset="@{testlist.offset}"
<testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
exclude="**/*.java" timeout="${test.timeout}" testtag="compression">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
@ -1429,14 +1424,13 @@
<macrodef name="testlist-cdc">
<attribute name="test.file.list" />
<attribute name="testlist.offset" />
<sequential>
<property name="cdc_yaml" value="${build.test.dir}/cassandra.cdc.yaml"/>
<concat destfile="${cdc_yaml}">
<fileset file="${test.conf}/cassandra.yaml"/>
<fileset file="${test.conf}/cdc.yaml"/>
</concat>
<testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}" poffset="@{testlist.offset}"
<testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
exclude="**/*.java" timeout="${test.timeout}" testtag="cdc">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
@ -1490,16 +1484,16 @@
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
<fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
</path>
<property name="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist-compression" />
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist-compression test.file.list="${test.file.list}"/>
</target>
<target name="test-cdc" depends="build-test" description="Execute unit tests with change-data-capture enabled">
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
</path>
<property name="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist-cdc" />
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist-cdc test.file.list="${test.file.list}"/>
</target>
<target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
@ -1705,7 +1699,7 @@
</create-javadoc>
</target>
<!-- Run tests not in parallel and reports errors and generates a junit report after -->
<!-- Run tests and reports errors and generates a junit report after -->
<macrodef name="testmacro">
<attribute name="inputdir" />
<attribute name="timeout" default="${test.timeout}" />
@ -1738,111 +1732,12 @@
</sequential>
</macrodef>
<!-- Run tests in parallel and report errors after and generate a junit report -->
<macrodef name="testparallel">
<attribute name="testdelegate"/>
<sequential>
<testparallelhelper testdelegate="@{testdelegate}"/>
<fail message="Some test(s) failed.">
<condition>
<and>
<isset property="testfailed"/>
<not>
<isset property="ant.test.failure.ignore"/>
</not>
</and>
</condition>
</fail>
</sequential>
</macrodef>
<!-- Run multiple junit tasks in parallel, but don't track errors or generate a report after
If a test fails the testfailed property will be set. All the tests are run using te testdelegate
macro that is specified as an attribute and they will be run concurrently in this ant process -->
<scriptdef name="testparallelhelper" language="javascript">
<attribute name="testdelegate"/>
<![CDATA[
sep = project.getProperty("path.separator");
all = project.getProperty("all-test-classes").split(sep);
runners = project.getProperty("test.runners")
cores = project.getProperty("cores.count")
mem = project.getProperty("mem.size")
numRunners = 1
if (runners != null) // there's test.runners override
numRunners = parseInt(runners) || 1;
else if (cores != null && mem != null) // only if cores and memory size is set
numRunners = Math.min(Math.floor(Math.sqrt(parseInt(cores) || 1)),
Math.floor((parseInt(mem) || 1)/(4*1024*1024*1024)));
if (numRunners < 1)
numRunners = 1
var echo = project.createTask("echo");
echo.setMessage("Number of test runners: " + numRunners);
echo.perform();
var p = project.createTask('parallel');
p.setThreadCount(numRunners);
for (i = 0; i < all.length; i++) {
if (all[i] == undefined) continue;
task = project.createTask( attributes.get("testdelegate") );
task.setDynamicAttribute( "test.file.list", "" + all[i]);
task.setDynamicAttribute( "testlist.offset", "" + i );
p.addTask(task);
}
p.perform();
]]>
</scriptdef>
<target name="get-cores">
<property environment="env"/>
<!-- support for Windows -->
<condition property="cores.count" value="${env.NUMBER_OF_PROCESSORS}">
<os family="windows" />
</condition>
<!-- support for Linux and Solaris (package SUNWgnu-coreutils is required) -->
<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
<arg value="--all"/>
</exec>
<!-- support for Mac OS X -->
<exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.ncpu"/>
</exec>
<echo message="Number of cores: ${cores.count}"/>
</target>
<target name="get-mem">
<condition property="mem.size" value="unknown">
<os family="windows" />
</condition>
<!-- support for Linux and Solaris (package SUNWgnu-coreutils is required) -->
<exec executable="bash" outputproperty="mem.size" os="Linux,SunOS,Solaris" failifexecutionfails="false">
<arg value="-c"/>
<arg value="free -b | grep Mem: | awk '{print $2}'"/>
</exec>
<!-- support for Mac OS X -->
<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.memsize"/>
</exec>
<echo message="Mem size : ${mem.size}"/>
</target>
<target name="test" depends="eclipse-warnings,build-test,get-cores,get-mem" description="Parallel Test Runner">
<target name="test" depends="eclipse-warnings,build-test" description="Test Runner">
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" excludes="**/distributed/test/UpgradeTest*.java" />
</path>
<property name="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist"/>
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist test.file.list="${test.file.list}"/>
</target>
<target name="generate-test-report" description="Generates JUnit's HTML report from results already in build/output">
@ -1857,26 +1752,28 @@
<!-- run a list of tests as provided in -Dtest.classlistfile (or default of 'testnames.txt')
The class list file should be one test class per line, with the path starting after test/unit
e.g. org/apache/cassandra/hints/HintMessageTest.java -->
<target name="testclasslist" depends="build-test" description="Parallel-run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
<target name="testclasslist" 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="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist"/>
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist test.file.list="${test.file.list}"/>
</target>
<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)">
<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="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist-compression"/>
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist-compression test.file.list="${test.file.list}"/>
</target>
<target name="testclasslist-cdc" depends="build-test" description="Parallel-run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
<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="all-test-classes" refid="all-test-classes-path"/>
<testparallel testdelegate="testlist-cdc"/>
<property name="test.file.list" refid="all-test-classes-path"/>
<testlist-cdc test.file.list="${test.file.list}"/>
</target>
<target name="dtest-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">