Zen2: Add infrastructure for integration tests (#34365)

ywelsch · web-flow · commit 5fbead00a3bf · 2018-10-14T20:55:04.000+01:00
Adds the infrastructure to run integration tests against Zen2.
diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
@@ -30,6 +30,7 @@
 import org.elasticsearch.cluster.block.ClusterBlocks;
 import org.elasticsearch.cluster.coordination.FollowersChecker.FollowerCheckRequest;
 import org.elasticsearch.cluster.coordination.JoinHelper.InitialJoinAccumulator;
+import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.allocation.AllocationService;
@@ -429,8 +430,8 @@ Mode getMode() {
         }
     }
 
-    // package-visible for testing
-    DiscoveryNode getLocalNode() {
+    // visible for testing
+    public DiscoveryNode getLocalNode() {
         return transportService.getLocalNode();
     }
 
@@ -578,6 +579,10 @@ public void setInitialConfiguration(final VotingConfiguration votingConfiguratio
             final Builder builder = masterService.incrementVersion(currentState);
             builder.lastAcceptedConfiguration(votingConfiguration);
             builder.lastCommittedConfiguration(votingConfiguration);
+            MetaData.Builder metaDataBuilder = MetaData.builder();
+            // automatically generate a UID for the metadata if we need to
+            metaDataBuilder.generateClusterUuidIfNeeded(); // TODO generate UUID in bootstrapping tool?
+            builder.metaData(metaDataBuilder);
             coordinationState.get().setInitialState(builder.build());
             preVoteCollector.update(getPreVoteResponse(), null); // pick up the change to last-accepted version
             startElectionScheduler();
diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java
@@ -21,8 +21,10 @@
 
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
+import org.elasticsearch.test.discovery.TestZenDiscovery;
 
 import java.util.Arrays;
 
@@ -33,6 +35,14 @@
 
 @ClusterScope(scope = ESIntegTestCase.Scope.TEST)
 public class IndicesStatsBlocksIT extends ESIntegTestCase {
+
+    @Override
+    protected Settings nodeSettings(int nodeOrdinal) {
+        return Settings.builder().put(super.nodeSettings(nodeOrdinal))
+            .put(TestZenDiscovery.USE_ZEN2.getKey(), true)
+            .build();
+    }
+
     public void testIndicesStatsWithBlocks() {
         createIndex("ro");
         ensureGreen("ro");
diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java
@@ -809,44 +809,7 @@ public static ClusterState setValue(ClusterState clusterState, long value) {
     public static long value(ClusterState clusterState) {
         return clusterState.metaData().persistentSettings().getAsLong("value", 0L);
     }
-
-    public static class InMemoryPersistedState implements PersistedState {
-        // TODO add support and tests for behaviour with persistence-layer failures
-
-        private long currentTerm;
-        private ClusterState acceptedState;
-
-        public InMemoryPersistedState(long term, ClusterState acceptedState) {
-            this.currentTerm = term;
-            this.acceptedState = acceptedState;
-
-            assert currentTerm >= 0;
-            assert getLastAcceptedState().term() <= currentTerm :
-                "last accepted term " + getLastAcceptedState().term() + " cannot be above current term " + currentTerm;
-        }
-
-        @Override
-        public void setCurrentTerm(long currentTerm) {
-            assert this.currentTerm <= currentTerm;
-            this.currentTerm = currentTerm;
-        }
-
-        @Override
-        public void setLastAcceptedState(ClusterState clusterState) {
-            this.acceptedState = clusterState;
-        }
-
-        @Override
-        public long getCurrentTerm() {
-            return currentTerm;
-        }
-
-        @Override
-        public ClusterState getLastAcceptedState() {
-            return acceptedState;
-        }
-    }
-
+    
     static class ClusterNode {
 
         final DiscoveryNode localNode;
diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java
@@ -28,7 +28,6 @@
 import org.elasticsearch.cluster.ESAllocationTestCase;
 import org.elasticsearch.cluster.coordination.ClusterStatePublisher.AckListener;
 import org.elasticsearch.cluster.coordination.CoordinationState.PersistedState;
-import org.elasticsearch.cluster.coordination.CoordinationStateTests.InMemoryPersistedState;
 import org.elasticsearch.cluster.coordination.CoordinatorTests.Cluster.ClusterNode;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.service.ClusterApplier;
diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java
@@ -164,7 +164,7 @@ protected void onSendRequest(long requestId, String action, TransportRequest req
             transportService,
             ESAllocationTestCase.createAllocationService(Settings.EMPTY),
             masterService,
-            () -> new CoordinationStateTests.InMemoryPersistedState(term, initialState), r -> emptyList(),
+            () -> new InMemoryPersistedState(term, initialState), r -> emptyList(),
             new NoOpClusterApplier(),
             random);
         transportService.start();
diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java
@@ -22,7 +22,6 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ClusterState.VotingConfiguration;
-import org.elasticsearch.cluster.coordination.CoordinationStateTests.InMemoryPersistedState;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.lease.Releasable;
 import org.elasticsearch.common.settings.Settings;
diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java
@@ -62,7 +62,7 @@ class MockNode {
             this.localNode = localNode;
             ClusterState initialState = CoordinationStateTests.clusterState(0L, 0L, localNode,
                 VotingConfiguration.EMPTY_CONFIG, VotingConfiguration.EMPTY_CONFIG, 0L);
-            coordinationState = new CoordinationState(settings, localNode, new CoordinationStateTests.InMemoryPersistedState(0L,
+            coordinationState = new CoordinationState(settings, localNode, new InMemoryPersistedState(0L,
                 initialState));
         }
 
diff --git a/server/src/test/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/test/java/org/elasticsearch/recovery/RelocationIT.java
@@ -56,6 +56,7 @@
 import org.elasticsearch.test.ESIntegTestCase.Scope;
 import org.elasticsearch.test.InternalSettingsPlugin;
 import org.elasticsearch.test.MockIndexEventListener;
+import org.elasticsearch.test.discovery.TestZenDiscovery;
 import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.test.transport.StubbableTransport;
@@ -99,6 +100,13 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Arrays.asList(InternalSettingsPlugin.class, MockTransportService.TestPlugin.class, MockIndexEventListener.TestPlugin.class);
     }
 
+    @Override
+    protected Settings nodeSettings(int nodeOrdinal) {
+        return Settings.builder().put(super.nodeSettings(nodeOrdinal))
+            .put(TestZenDiscovery.USE_ZEN2.getKey(), true)
+            .build();
+    }
+
     @Override
     protected void beforeIndexDeletion() throws Exception {
         super.beforeIndexDeletion();
diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/InMemoryPersistedState.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/InMemoryPersistedState.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.cluster.coordination;
+
+import org.elasticsearch.cluster.ClusterState;
+
+public class InMemoryPersistedState implements CoordinationState.PersistedState {
+    // TODO add support and tests for behaviour with persistence-layer failures
+
+    private long currentTerm;
+    private ClusterState acceptedState;
+
+    public InMemoryPersistedState(long term, ClusterState acceptedState) {
+        this.currentTerm = term;
+        this.acceptedState = acceptedState;
+
+        assert currentTerm >= 0;
+        assert getLastAcceptedState().term() <= currentTerm :
+            "last accepted term " + getLastAcceptedState().term() + " cannot be above current term " + currentTerm;
+    }
+
+    @Override
+    public void setCurrentTerm(long currentTerm) {
+        assert this.currentTerm <= currentTerm;
+        this.currentTerm = currentTerm;
+    }
+
+    @Override
+    public void setLastAcceptedState(ClusterState clusterState) {
+        this.acceptedState = clusterState;
+    }
+
+    @Override
+    public long getCurrentTerm() {
+        return currentTerm;
+    }
+
+    @Override
+    public ClusterState getLastAcceptedState() {
+        return acceptedState;
+    }
+}
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
@@ -1944,16 +1944,17 @@ protected TestCluster buildTestCluster(Scope scope, long seed) throws IOExceptio
     }
 
     protected NodeConfigurationSource getNodeConfigSource() {
-        Settings.Builder networkSettings = Settings.builder();
+        Settings.Builder initialNodeSettings = Settings.builder();
+        Settings.Builder initialTransportClientSettings = Settings.builder();
         if (addMockTransportService()) {
-            networkSettings.put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType());
+            initialNodeSettings.put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType());
+            initialTransportClientSettings.put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType());
         }
-
         return new NodeConfigurationSource() {
             @Override
             public Settings nodeSettings(int nodeOrdinal) {
                 return Settings.builder()
-                    .put(networkSettings.build())
+                    .put(initialNodeSettings.build())
                     .put(ESIntegTestCase.this.nodeSettings(nodeOrdinal)).build();
             }
 
@@ -1969,7 +1970,7 @@ public Collection<Class<? extends Plugin>> nodePlugins() {
 
             @Override
             public Settings transportClientSettings() {
-                return Settings.builder().put(networkSettings.build())
+                return Settings.builder().put(initialTransportClientSettings.build())
                     .put(ESIntegTestCase.this.transportClientSettings()).build();
             }
 
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
@@ -190,6 +190,7 @@ private Node newNode() {
             .put(EsExecutors.PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created
             .put("transport.type", getTestTransportType())
             .put(Node.NODE_DATA_SETTING.getKey(), true)
+            .put(TestZenDiscovery.USE_ZEN2.getKey(), true)
             .put(NodeEnvironment.NODE_ID_SEED_SETTING.getKey(), random().nextLong())
             // default the watermarks low values to prevent tests from failing on nodes without enough disk space
             .put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), "1b")
@@ -213,13 +214,16 @@ private Node newNode() {
         if (addMockHttpTransport()) {
             plugins.add(MockHttpTransport.TestPlugin.class);
         }
-        Node build = new MockNode(settings, plugins, forbidPrivateIndexSettings());
-        try {
-            build.start();
-        } catch (NodeValidationException e) {
-            throw new RuntimeException(e);
-        }
-        return build;
+        Node node = new MockNode(settings, plugins, forbidPrivateIndexSettings());
+        bootstrapNodes(true,
+            () -> {
+                try {
+                    node.start();
+                } catch (NodeValidationException e) {
+                    throw new RuntimeException(e);
+                }
+            }, Collections.singletonList(node), logger);
+        return node;
     }
 
     /**
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
diff --git a/test/framework/src/main/java/org/elasticsearch/test/discovery/TestZenDiscovery.java b/test/framework/src/main/java/org/elasticsearch/test/discovery/TestZenDiscovery.java

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class MockNode {`
`62`	`62`	`this.localNode = localNode;`
`63`	`63`	`ClusterState initialState = CoordinationStateTests.clusterState(0L, 0L, localNode,`
`64`	`64`	`VotingConfiguration.EMPTY_CONFIG, VotingConfiguration.EMPTY_CONFIG, 0L);`
`65`		`- coordinationState = new CoordinationState(settings, localNode, new CoordinationStateTests.InMemoryPersistedState(0L,`
	`65`	`+ coordinationState = new CoordinationState(settings, localNode, new InMemoryPersistedState(0L,`
`66`	`66`	`initialState));`
`67`	`67`	`}`
`68`	`68`