diff --git a/pom.xml b/pom.xml index a075b276569..db3b6bf05a3 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ com.carrotsearch.randomizedtesting randomizedtesting-runner - 2.1.6 + 2.1.10 test diff --git a/src/test/java/org/elasticsearch/test/CompositeTestCluster.java b/src/test/java/org/elasticsearch/test/CompositeTestCluster.java index 4e83bae9120..161f46d7a80 100644 --- a/src/test/java/org/elasticsearch/test/CompositeTestCluster.java +++ b/src/test/java/org/elasticsearch/test/CompositeTestCluster.java @@ -57,6 +57,7 @@ public class CompositeTestCluster extends TestCluster { private static final String NODE_PREFIX = "external_"; public CompositeTestCluster(InternalTestCluster cluster, int numExternalNodes, ExternalNode externalNode) throws IOException { + super(cluster.seed()); this.cluster = cluster; this.externalNodes = new ExternalNode[numExternalNodes]; for (int i = 0; i < externalNodes.length; i++) { diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java index 3ef743ff140..4cc394c5fc4 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java @@ -133,8 +133,8 @@ public abstract class ElasticsearchBackwardsCompatIntegrationTest extends Elasti return (CompositeTestCluster) cluster(); } - protected TestCluster buildTestCluster(Scope scope) throws IOException { - TestCluster cluster = super.buildTestCluster(scope); + protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException { + TestCluster cluster = super.buildTestCluster(scope, seed); ExternalNode externalNode = new ExternalNode(backwardsCompatibilityPath(), randomLong(), new SettingsSource() { @Override public Settings node(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java index e82cebacee7..ba0abedc88b 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java @@ -19,6 +19,7 @@ package org.elasticsearch.test; import com.carrotsearch.randomizedtesting.RandomizedContext; +import com.carrotsearch.randomizedtesting.Randomness; import com.carrotsearch.randomizedtesting.SeedUtils; import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -251,65 +252,28 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase private static final Map, TestCluster> clusters = new IdentityHashMap<>(); private static ElasticsearchIntegrationTest INSTANCE = null; // see @SuiteScope + private static Long SUITE_SEED = null; @BeforeClass public static void beforeClass() throws Exception { - initializeGlobalCluster(); + SUITE_SEED = randomLong(); initializeSuiteScope(); } - private static void initializeGlobalCluster() { - // Initialize lazily. No need for volatiles/ CASs since each JVM runs at most one test - // suite at any given moment. - if (GLOBAL_CLUSTER == null) { - String cluster = System.getProperty(TESTS_CLUSTER); - if (Strings.hasLength(cluster)) { - String[] stringAddresses = cluster.split(","); - TransportAddress[] transportAddresses = new TransportAddress[stringAddresses.length]; - int i = 0; - for (String stringAddress : stringAddresses) { - String[] split = stringAddress.split(":"); - if (split.length < 2) { - throw new IllegalArgumentException("address [" + cluster + "] not valid"); - } - try { - transportAddresses[i++] = new InetSocketTransportAddress(split[0], Integer.valueOf(split[1])); - } catch (NumberFormatException e) { - throw new IllegalArgumentException("port is not valid, expected number but was [" + split[1] + "]"); - } - } - GLOBAL_CLUSTER = new ExternalTestCluster(transportAddresses); - } else { - long masterSeed = SeedUtils.parseSeed(RandomizedContext.current().getRunnerSeedAsString()); - int numClientNodes; - if (globalCompatibilityVersion().before(Version.V_1_2_0)) { - numClientNodes = 0; - } else { - numClientNodes = InternalTestCluster.DEFAULT_NUM_CLIENT_NODES; - } - GLOBAL_CLUSTER = new InternalTestCluster(masterSeed, InternalTestCluster.DEFAULT_MIN_NUM_DATA_NODES, InternalTestCluster.DEFAULT_MAX_NUM_DATA_NODES, - clusterName("shared", Integer.toString(CHILD_JVM_ID), masterSeed), numClientNodes, InternalTestCluster.DEFAULT_ENABLE_RANDOM_BENCH_NODES, - CHILD_JVM_ID, GLOBAL_CLUSTER_NODE_PREFIX); - } - } - } - - protected final void beforeInternal() throws IOException { + protected final void beforeInternal() throws Exception { assert Thread.getDefaultUncaughtExceptionHandler() instanceof ElasticsearchUncaughtExceptionHandler; try { final Scope currentClusterScope = getCurrentClusterScope(); switch (currentClusterScope) { case GLOBAL: - clearClusters(); - assert GLOBAL_CLUSTER != null : "Scope.GLOBAL cluster must be initialied in a static context"; - currentCluster = GLOBAL_CLUSTER; + currentCluster = buildAndPutCluster(currentClusterScope, SeedUtils.parseSeed(RandomizedContext.current().getRunnerSeedAsString())); break; case SUITE: - assert clusters.containsKey(this.getClass()) : "Scope.SUITE cluster must be initialized in a static context"; - currentCluster = buildAndPutCluster(currentClusterScope, false); + assert SUITE_SEED != null : "Suite seed was not initialized"; + currentCluster = buildAndPutCluster(currentClusterScope, SUITE_SEED.longValue()); break; case TEST: - currentCluster = buildAndPutCluster(currentClusterScope, true); + currentCluster = buildAndPutCluster(currentClusterScope, randomLong()); break; default: fail("Unknown Scope: [" + currentClusterScope + "]"); @@ -578,28 +542,50 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase return builder; } - public TestCluster buildAndPutCluster(Scope currentClusterScope, boolean createIfExists) throws IOException { - TestCluster testCluster = clusters.get(this.getClass()); - if (createIfExists || testCluster == null) { - testCluster = buildTestCluster(currentClusterScope); - } else { - // if we carry that cluster over ie. it was already there we remove it and then call clearClusters - // and put it back afterwards such that all pending leftover clusters are closed and disposed... - clusters.remove(this.getClass()); + private TestCluster buildWithPrivateContext(final Scope scope, final long seed) throws Exception { + return RandomizedContext.current().runWithPrivateRandomness(new Randomness(seed), new Callable() { + @Override + public TestCluster call() throws Exception { + return buildTestCluster(scope, seed); + } + }); + } + + private TestCluster buildAndPutCluster(Scope currentClusterScope, long seed) throws Exception { + final Class clazz = this.getClass(); + TestCluster testCluster = clusters.remove(clazz); // remove this cluster first + clearClusters(); // all leftovers are gone by now... this is really just a double safety if we miss something somewhere + switch (currentClusterScope) { + case GLOBAL: + // never put the global cluster into the map otherwise it will be closed + if (GLOBAL_CLUSTER == null) { + return GLOBAL_CLUSTER = buildWithPrivateContext(currentClusterScope, seed); + } + return GLOBAL_CLUSTER; + case SUITE: + if (testCluster == null) { // only build if it's not there yet + testCluster = buildWithPrivateContext(currentClusterScope, seed); + } + break; + case TEST: + // close the previous one and create a new one + IOUtils.closeWhileHandlingException(testCluster); + testCluster = buildTestCluster(currentClusterScope, seed); + break; } - clearClusters(); - clusters.put(this.getClass(), testCluster); + assert testCluster != GLOBAL_CLUSTER : "Global cluster must be handled via the GLOBAL_CLUSTER static member"; + clusters.put(clazz, testCluster); return testCluster; } - private static void clearClusters() throws IOException { + private static void clearClusters() throws IOException { if (!clusters.isEmpty()) { IOUtils.close(clusters.values()); clusters.clear(); } } - protected final void afterInternal() throws IOException { + protected final void afterInternal() throws Exception { boolean success = false; try { logger.info("[{}#{}]: cleaning up after test", getTestClass().getSimpleName(), getTestName()); @@ -636,10 +622,9 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase clearClusters(); if (currentCluster == GLOBAL_CLUSTER) { if (GLOBAL_CLUSTER != null) { - GLOBAL_CLUSTER.close(); + IOUtils.closeWhileHandlingException(GLOBAL_CLUSTER); } GLOBAL_CLUSTER = null; - initializeGlobalCluster(); // re-init that cluster } currentCluster = null; } @@ -1606,36 +1591,20 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase return ImmutableSettings.EMPTY; } - protected TestCluster buildTestCluster(Scope scope) throws IOException { - long currentClusterSeed = randomLong(); - - SettingsSource settingsSource = new SettingsSource() { - @Override - public Settings node(int nodeOrdinal) { - return ImmutableSettings.builder().put(InternalNode.HTTP_ENABLED, false). - put(nodeSettings(nodeOrdinal)).build(); - } - - @Override - public Settings transportClient() { - return transportClientSettings(); - } - }; - - int numDataNodes = getNumDataNodes(); - int minNumDataNodes, maxNumDataNodes; - if (numDataNodes >= 0) { - minNumDataNodes = maxNumDataNodes = numDataNodes; - } else { - minNumDataNodes = getMinNumDataNodes(); - maxNumDataNodes = getMaxNumDataNodes(); - } - - int numClientNodes = getNumClientNodes(); - boolean enableRandomBenchNodes = enableRandomBenchNodes(); - - String nodePrefix; + protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException { + int numClientNodes = InternalTestCluster.DEFAULT_NUM_CLIENT_NODES; + boolean enableRandomBenchNodes = InternalTestCluster.DEFAULT_ENABLE_RANDOM_BENCH_NODES; + int minNumDataNodes = InternalTestCluster.DEFAULT_MIN_NUM_DATA_NODES; + int maxNumDataNodes = InternalTestCluster.DEFAULT_MAX_NUM_DATA_NODES; + SettingsSource settingsSource = InternalTestCluster.DEFAULT_SETTINGS_SOURCE; + final String nodePrefix; switch (scope) { + case GLOBAL: + if (globalCompatibilityVersion().before(Version.V_1_2_0)) { + numClientNodes = 0; + } + nodePrefix = GLOBAL_CLUSTER_NODE_PREFIX; + break; case TEST: nodePrefix = TEST_CLUSTER_NODE_PREFIX; break; @@ -1645,8 +1614,52 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase default: throw new ElasticsearchException("Scope not supported: " + scope); } - return new InternalTestCluster(currentClusterSeed, minNumDataNodes, maxNumDataNodes, - clusterName(scope.name(), Integer.toString(CHILD_JVM_ID), currentClusterSeed), settingsSource, numClientNodes, + if (scope == Scope.GLOBAL) { + String cluster = System.getProperty(TESTS_CLUSTER); + if (Strings.hasLength(cluster)) { + String[] stringAddresses = cluster.split(","); + TransportAddress[] transportAddresses = new TransportAddress[stringAddresses.length]; + int i = 0; + for (String stringAddress : stringAddresses) { + String[] split = stringAddress.split(":"); + if (split.length < 2) { + throw new IllegalArgumentException("address [" + cluster + "] not valid"); + } + try { + transportAddresses[i++] = new InetSocketTransportAddress(split[0], Integer.valueOf(split[1])); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("port is not valid, expected number but was [" + split[1] + "]"); + } + } + return new ExternalTestCluster(transportAddresses); + } + } else { + settingsSource = new SettingsSource() { + @Override + public Settings node(int nodeOrdinal) { + return ImmutableSettings.builder().put(InternalNode.HTTP_ENABLED, false). + put(nodeSettings(nodeOrdinal)).build(); + } + + @Override + public Settings transportClient() { + return transportClientSettings(); + } + }; + + int numDataNodes = getNumDataNodes(); + if (numDataNodes >= 0) { + minNumDataNodes = maxNumDataNodes = numDataNodes; + } else { + minNumDataNodes = getMinNumDataNodes(); + maxNumDataNodes = getMaxNumDataNodes(); + } + + numClientNodes = getNumClientNodes(); + enableRandomBenchNodes = enableRandomBenchNodes(); + } + return new InternalTestCluster(seed, minNumDataNodes, maxNumDataNodes, + clusterName(scope.name(), Integer.toString(CHILD_JVM_ID), seed), settingsSource, numClientNodes, enableRandomBenchNodes, CHILD_JVM_ID, nodePrefix); } @@ -1760,7 +1773,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase @Before - public final void before() throws IOException { + public final void before() throws Exception { if (runTestScopeLifecycle()) { beforeInternal(); } @@ -1768,14 +1781,14 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase @After - public final void after() throws IOException { + public final void after() throws Exception { if (runTestScopeLifecycle()) { afterInternal(); } } @AfterClass - public static void afterClass() throws IOException { + public static void afterClass() throws Exception { if (!runTestScopeLifecycle()) { try { INSTANCE.afterInternal(); @@ -1785,7 +1798,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase } else { clearClusters(); } - + SUITE_SEED = null; } private static void initializeSuiteScope() throws Exception { @@ -1797,12 +1810,6 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase * must be executed in a static context. */ assert INSTANCE == null; - if (getCurrentClusterScope(targetClass) == Scope.SUITE) { - final ElasticsearchIntegrationTest instance = (ElasticsearchIntegrationTest) targetClass.newInstance(); - // if we have suite scoped cluster here we need to initialize the - // cluster before the first test starts for reproducibility - instance.buildAndPutCluster(Scope.SUITE, false); - } if (isSuiteScopedTest(targetClass)) { // note we need to do this this way to make sure this is reproducible INSTANCE = (ElasticsearchIntegrationTest) targetClass.newInstance(); diff --git a/src/test/java/org/elasticsearch/test/ExternalTestCluster.java b/src/test/java/org/elasticsearch/test/ExternalTestCluster.java index b5a7988fcf3..5b062df554c 100644 --- a/src/test/java/org/elasticsearch/test/ExternalTestCluster.java +++ b/src/test/java/org/elasticsearch/test/ExternalTestCluster.java @@ -67,7 +67,7 @@ public final class ExternalTestCluster extends TestCluster { private final int numBenchNodes; public ExternalTestCluster(TransportAddress... transportAddresses) { - + super(0); Settings clientSettings = ImmutableSettings.settingsBuilder() .put("config.ignore_system_properties", true) // prevents any settings to be replaced by system properties. .put("client.transport.ignore_cluster_name", true) diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java index be9635e4537..11ccd207b93 100644 --- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java +++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java @@ -201,6 +201,7 @@ public final class InternalTestCluster extends TestCluster { int minNumDataNodes, int maxNumDataNodes, String clusterName, SettingsSource settingsSource, int numClientNodes, boolean enableRandomBenchNodes, int jvmOrdinal, String nodePrefix) { + super(clusterSeed); this.clusterName = clusterName; if (minNumDataNodes < 0 || maxNumDataNodes < 0) { diff --git a/src/test/java/org/elasticsearch/test/TestCluster.java b/src/test/java/org/elasticsearch/test/TestCluster.java index 13c41d0cb26..1e46be50520 100644 --- a/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/src/test/java/org/elasticsearch/test/TestCluster.java @@ -44,11 +44,20 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; public abstract class TestCluster implements Iterable, Closeable { protected final ESLogger logger = Loggers.getLogger(getClass()); + private final long seed; protected Random random; protected double transportClientRatio = 0.0; + public TestCluster(long seed) { + this.seed = seed; + } + + public long seed() { + return seed; + } + /** * This method should be executed before each test to reset the cluster to its initial state. */ diff --git a/src/test/java/org/elasticsearch/test/test/GlobalScopeClusterTests.java b/src/test/java/org/elasticsearch/test/test/GlobalScopeClusterTests.java index c803cb65930..70f50313891 100644 --- a/src/test/java/org/elasticsearch/test/test/GlobalScopeClusterTests.java +++ b/src/test/java/org/elasticsearch/test/test/GlobalScopeClusterTests.java @@ -34,27 +34,31 @@ import static org.hamcrest.Matchers.equalTo; public class GlobalScopeClusterTests extends ElasticsearchIntegrationTest { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; + private static Long CLUSTER_SEED = null; @Test @Repeat(iterations = 10, useConstantSeed = true) - public void testReproducible() { + public void testReproducible() throws IOException { if (ITER++ == 0) { + CLUSTER_SEED = cluster().seed(); for (int i = 0; i < SEQUENCE.length; i++) { SEQUENCE[i] = randomLong(); } } else { + assertEquals(CLUSTER_SEED, new Long(cluster().seed())); for (int i = 0; i < SEQUENCE.length; i++) { assertThat(SEQUENCE[i], equalTo(randomLong())); } } } - protected TestCluster buildTestCluster(Scope scope) throws IOException { + @Override + protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException { // produce some randomness int iters = between(1, 100); for (int i = 0; i < iters; i++) { randomLong(); } - return super.buildTestCluster(scope); + return super.buildTestCluster(scope, seed); } } diff --git a/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java b/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java index 488a173abb3..3252daf5c5d 100644 --- a/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java +++ b/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java @@ -35,27 +35,31 @@ import static org.hamcrest.Matchers.equalTo; public class SuiteScopeClusterTests extends ElasticsearchIntegrationTest { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; + private static Long CLUSTER_SEED = null; @Test @Repeat(iterations = 10, useConstantSeed = true) - public void testReproducible() { + public void testReproducible() throws IOException { if (ITER++ == 0) { + CLUSTER_SEED = cluster().seed(); for (int i = 0; i < SEQUENCE.length; i++) { SEQUENCE[i] = randomLong(); } } else { + assertEquals(CLUSTER_SEED, new Long(cluster().seed())); for (int i = 0; i < SEQUENCE.length; i++) { assertThat(SEQUENCE[i], equalTo(randomLong())); } } } - protected TestCluster buildTestCluster(Scope scope) throws IOException { + @Override + protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException { // produce some randomness int iters = between(1, 100); for (int i = 0; i < iters; i++) { randomLong(); } - return super.buildTestCluster(scope); + return super.buildTestCluster(scope, seed); } } diff --git a/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java b/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java index 115c759801a..bf9097a17f0 100644 --- a/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java +++ b/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java @@ -35,27 +35,31 @@ import static org.hamcrest.Matchers.equalTo; public class TestScopeClusterTests extends ElasticsearchIntegrationTest { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; + private static Long CLUSTER_SEED = null; @Test @Repeat(iterations = 10, useConstantSeed = true) - public void testReproducible() { + public void testReproducible() throws IOException { if (ITER++ == 0) { + CLUSTER_SEED = cluster().seed(); for (int i = 0; i < SEQUENCE.length; i++) { SEQUENCE[i] = randomLong(); } } else { + assertEquals(CLUSTER_SEED, new Long(cluster().seed())); for (int i = 0; i < SEQUENCE.length; i++) { assertThat(SEQUENCE[i], equalTo(randomLong())); } } } - protected TestCluster buildTestCluster(Scope scope) throws IOException { + @Override + protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException { // produce some randomness int iters = between(1, 100); for (int i = 0; i < iters; i++) { randomLong(); } - return super.buildTestCluster(scope); + return super.buildTestCluster(scope, seed); } }