Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf6ddb3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf6ddb3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf6ddb3b Branch: refs/heads/trunk Commit: bf6ddb3bc8af19fd5b7c300c32e0d0071bcef192 Parents: c3ef43d 6308fb2 Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Tue Oct 23 23:32:49 2018 +0100 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Tue Oct 23 23:35:49 2018 +0100 ---------------------------------------------------------------------- build.xml | 34 + .../utils/memory/LongBufferPoolTest.java | 623 ++++++++++++------- 2 files changed, 421 insertions(+), 236 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf6ddb3b/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 28c33bf,c9565f8..3d3014c --- a/build.xml +++ b/build.xml @@@ -1441,17 -1400,14 +1441,26 @@@ </target> <!-- Use this with an FQDN for test class, and a csv list of methods like this: + ant long-testsome -Dtest.name=org.apache.cassandra.cql3.ViewLongTest -Dtest.methods=testConflictResolution + --> + <target name="long-testsome" depends="build-test" description="Execute specific long unit tests" > + <testmacro inputdir="${test.long.src}" timeout="${test.long.timeout}"> + <test name="${test.name}" methods="${test.methods}"/> + <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> + <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> + </testmacro> + </target> + ++ <!-- Use this with an FQDN for test class, and a csv list of methods like this: + ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dtest.methods=testAllocate + --> + <target name="burn-testsome" depends="build-test" description="Execute specific burn unit tests" > + <testmacro inputdir="${test.burn.src}" timeout="${test.burn.timeout}"> + <test name="${test.name}" methods="${test.methods}"/> + </testmacro> + </target> - <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled"> ++ + <target name="test-compression" depends="build-test, stress-build, fqltool-build" description="Execute unit tests with sstable compression enabled"> <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/> <concat destfile="${compressed_yaml}"> <fileset file="${test.conf}/cassandra.yaml"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf6ddb3b/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java ---------------------------------------------------------------------- diff --cc test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java index 17ac569,66abe5a..57aa940 --- a/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java +++ b/test/burn/org/apache/cassandra/utils/memory/LongBufferPoolTest.java @@@ -27,11 -27,11 +27,13 @@@ import java.util.concurrent.* import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.util.concurrent.Uninterruptibles; ++import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; ++import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.DynamicList; import static org.junit.Assert.*; @@@ -40,6 -62,10 +64,16 @@@ public class LongBufferPoolTes { private static final Logger logger = LoggerFactory.getLogger(LongBufferPoolTest.class); + private static final int AVG_BUFFER_SIZE = 16 << 10; + private static final int STDEV_BUFFER_SIZE = 10 << 10; // picked to ensure exceeding buffer size is rare, but occurs + private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + ++ @BeforeClass ++ public static void setup() throws Exception ++ { ++ DatabaseDescriptor.daemonInitialization(); ++ } ++ @Test public void testAllocate() throws InterruptedException, ExecutionException { @@@ -407,9 -535,19 +543,20 @@@ } } - public static void main(String[] args) throws InterruptedException, ExecutionException + public static void main(String[] args) { - new LongBufferPoolTest().testAllocate(Runtime.getRuntime().availableProcessors(), TimeUnit.HOURS.toNanos(2L), 16 << 20); + try + { ++ LongBufferPoolTest.setup(); + new LongBufferPoolTest().testAllocate(Runtime.getRuntime().availableProcessors(), + TimeUnit.HOURS.toNanos(2L), 16 << 20); + System.exit(0); + } + catch (Throwable tr) + { + System.out.println(String.format("Test failed - %s", tr.getMessage())); + System.exit(1); // Force exit so that non-daemon threads like REQUEST-SCHEDULER do not hang the process on failure + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
