Switch more tests to zen2

Author: Andrey Ershov

server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java

@@ -276,11 +276,18 @@ public void testTwoNodesSingleDoc() throws Exception {
     }
 
     public void testDanglingIndices() throws Exception {
+        /*TODO This test test does not work with Zen2, because once master node looses its cluster state during restart
+        it will start with term = 1, which is the same as the term data node has. Data node won't accept cluster state from master
+        after the restart, because the term is the same, but version of the cluster state is greater on the data node.
+        Consider adding term to JoinRequest, so that master node can bump its term if its current term is less than JoinRequest#term.
+        */
         logger.info("--> starting two nodes");
-
-        final String node_1 = internalCluster().startNodes(2,
-                //TODO fails wih Zen2
-                Settings.builder().put(TestZenDiscovery.USE_ZEN2.getKey(), false).build()).get(0);
+        String masterNode = internalCluster().startNode(Settings.builder()
+                .put(Settings.builder().put(TestZenDiscovery.USE_ZEN2.getKey(), false).build())
+                .build());
+        internalCluster().startDataOnlyNode(Settings.builder()
+                .put(Settings.builder().put(TestZenDiscovery.USE_ZEN2.getKey(), false).build())
+                .build());
 
         logger.info("--> indexing a simple document");
         client().prepareIndex("test", "type1", "1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get();
@@ -294,11 +301,11 @@ public void testDanglingIndices() throws Exception {
         }
         assertThat(client().prepareGet("test", "type1", "1").execute().actionGet().isExists(), equalTo(true));
 
-        logger.info("--> restarting the nodes");
-        internalCluster().fullRestart(new RestartCallback() {
+        logger.info("--> restarting master node, while clearing its data");
+        internalCluster().restartNode(masterNode, new RestartCallback() {
             @Override
             public boolean clearData(String nodeName) {
-                return node_1.equals(nodeName);
+                return true;
             }
         });
 
@@ -328,14 +335,14 @@ public boolean clearData(String nodeName) {
      */
     public void testIndexDeletionWhenNodeRejoins() throws Exception {
         final String indexName = "test-index-del-on-node-rejoin-idx";
-        final int numNodes = 2;
+        // We need at least 3 nodes to make sure, that once one node is stopped, remaining nodes can elect a new master
+        final int numNodes = 3;
 
         final List<String> nodes;
         logger.info("--> starting a cluster with " + numNodes + " nodes");
+
         nodes = internalCluster().startNodes(numNodes,
-            Settings.builder().put(IndexGraveyard.SETTING_MAX_TOMBSTONES.getKey(), randomIntBetween(10, 100))
-                    //TODO fails with Zen2
-                    .put(TestZenDiscovery.USE_ZEN2.getKey(), false).build());
+            Settings.builder().put(IndexGraveyard.SETTING_MAX_TOMBSTONES.getKey(), randomIntBetween(10, 100)).build());
         logger.info("--> create an index");
         createIndex(indexName);
 
@@ -355,6 +362,7 @@ public Settings onNodeStopped(final String nodeName) throws Exception {
                 final Client client = client(otherNode);
                 client.admin().indices().prepareDelete(indexName).execute().actionGet();
                 assertFalse(client.admin().indices().prepareExists(indexName).execute().actionGet().isExists());
+                logger.info("--> deleted");
                 return super.onNodeStopped(nodeName);
             }
         });

server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java

@@ -70,7 +70,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;
 import org.elasticsearch.test.InternalTestCluster;
-import org.elasticsearch.test.discovery.TestZenDiscovery;
 import org.elasticsearch.test.engine.MockEngineSupport;
 import org.elasticsearch.test.transport.MockTransportService;
 
@@ -102,13 +101,6 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 0)
 public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase {
 
-    @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder().put(super.nodeSettings(nodeOrdinal))
-            .put(TestZenDiscovery.USE_ZEN2.getKey(), false) // no state persistence yet
-            .build();
-    }
-
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Arrays.asList(MockTransportService.TestPlugin.class, MockEngineFactoryPlugin.class, InternalSettingsPlugin.class);
@@ -260,7 +252,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
     }
 
     public void testCorruptTranslogTruncation() throws Exception {
-        internalCluster().startNodes(2, Settings.EMPTY);
+        internalCluster().startNodes(2);
 
         final String node1 = internalCluster().getNodeNames()[0];
         final String node2 = internalCluster().getNodeNames()[1];
@@ -436,10 +428,10 @@ public Settings onNodeStopped(String nodeName) throws Exception {
     }
 
     public void testCorruptTranslogTruncationOfReplica() throws Exception {
-        internalCluster().startNodes(2, Settings.EMPTY);
+        internalCluster().startMasterOnlyNode();
 
-        final String node1 = internalCluster().getNodeNames()[0];
-        final String node2 = internalCluster().getNodeNames()[1];
+        final String node1 = internalCluster().startDataOnlyNode();
+        final String node2 = internalCluster().startDataOnlyNode();
         logger.info("--> nodes name: {}, {}", node1, node2);
 
         final String indexName = "test";
@@ -481,12 +473,11 @@ public void testCorruptTranslogTruncationOfReplica() throws Exception {
         final ShardId shardId = new ShardId(resolveIndex(indexName), 0);
         final Set<Path> translogDirs = getDirs(node2, shardId, ShardPath.TRANSLOG_FOLDER_NAME);
 
-        // stop the cluster nodes. we don't use full restart so the node start up order will be the same
-        // and shard roles will be maintained
+        // stop data nodes. After the restart the 1st node will be primary and the 2nd node will be replica
         internalCluster().stopRandomDataNode();
         internalCluster().stopRandomDataNode();
 
-        // Corrupt the translog file(s)
+        // Corrupt the translog file(s) on the replica
         logger.info("--> corrupting translog");
         TestTranslog.corruptRandomTranslogFile(logger, random(), translogDirs);
 
@@ -555,8 +546,10 @@ public Settings onNodeStopped(String nodeName) throws Exception {
     }
 
     public void testResolvePath() throws Exception {
+        internalCluster().startMasterOnlyNode();
+
         final int numOfNodes = randomIntBetween(1, 5);
-        final List<String> nodeNames = internalCluster().startNodes(numOfNodes, Settings.EMPTY);
+        final List<String> nodeNames = internalCluster().startNodes(numOfNodes);
 
         final String indexName = "test" + randomInt(100);
         assertAcked(prepareCreate(indexName).setSettings(Settings.builder()

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java

@@ -188,7 +188,6 @@ private NodeConfigurationSource createNodeConfigurationSource() {
         builder.put(IndicesStore.INDICES_STORE_DELETE_SHARD_TIMEOUT.getKey(), new TimeValue(1, TimeUnit.SECONDS));
         builder.putList(DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING.getKey()); // empty list disables a port scan for other nodes
         builder.putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file");
-        builder.put(TestZenDiscovery.USE_ZEN2.getKey(), false); // some tests do full cluster restarts
         builder.put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType());
         builder.put(XPackSettings.SECURITY_ENABLED.getKey(), false);
         builder.put(XPackSettings.MONITORING_ENABLED.getKey(), false);