Browse Source

User minimum_master_nodes in tests that shutdown nodes some of those time out on Windows

Simon Willnauer 12 years ago
parent
commit
e18bee50ef

+ 3 - 1
src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java

@@ -137,7 +137,9 @@ public class QuorumLocalGatewayTests extends ElasticsearchIntegrationTest {
         for (int i = 0; i < 10; i++) {
         for (int i = 0; i < 10; i++) {
             assertHitCount(client().prepareCount().setQuery(matchAllQuery()).get(), 2l);
             assertHitCount(client().prepareCount().setQuery(matchAllQuery()).get(), 2l);
         }
         }
-
+        client().admin().cluster().prepareUpdateSettings().setTransientSettings(settingsBuilder()
+                .put("discovery.zen.minimum_master_nodes", 2)) // we are shutting down nodes - make sure we don't have 2 clusters if we test network
+                .get();
         logger.info("--> restart all nodes");
         logger.info("--> restart all nodes");
         cluster().fullRestart(new RestartCallback() {
         cluster().fullRestart(new RestartCallback() {
             @Override
             @Override

+ 6 - 2
src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java

@@ -174,7 +174,9 @@ public class IndexLifecycleActionTests extends ElasticsearchIntegrationTest {
         assertThat(routingNodeEntry3.numberOfShardsWithState(INITIALIZING), equalTo(0));
         assertThat(routingNodeEntry3.numberOfShardsWithState(INITIALIZING), equalTo(0));
         assertThat(routingNodeEntry3.numberOfShardsWithState(STARTED), equalTo(7));
         assertThat(routingNodeEntry3.numberOfShardsWithState(STARTED), equalTo(7));
 
 
-
+        client().admin().cluster().prepareUpdateSettings().setTransientSettings(settingsBuilder()
+                .put("discovery.zen.minimum_master_nodes", 2)) // we are shutting down a node - make sure we don't have 2 clusters if we test network
+                .get();
         logger.info("Closing server1");
         logger.info("Closing server1");
         // kill the first server
         // kill the first server
         cluster().stopRandomNode(TestCluster.nameFilter(server_1));
         cluster().stopRandomNode(TestCluster.nameFilter(server_1));
@@ -339,7 +341,9 @@ public class IndexLifecycleActionTests extends ElasticsearchIntegrationTest {
         assertThat(routingNodeEntry3.numberOfShardsWithState(INITIALIZING), equalTo(0));
         assertThat(routingNodeEntry3.numberOfShardsWithState(INITIALIZING), equalTo(0));
         assertThat(routingNodeEntry3.numberOfShardsWithState(STARTED), equalTo(3));
         assertThat(routingNodeEntry3.numberOfShardsWithState(STARTED), equalTo(3));
 
 
-
+        client().admin().cluster().prepareUpdateSettings().setTransientSettings(settingsBuilder()
+                .put("discovery.zen.minimum_master_nodes", 2)) // we are shutting down a node - make sure we don't have 2 clusters if we test network
+                .get();
         logger.info("Closing server1");
         logger.info("Closing server1");
         // kill the first server
         // kill the first server
         cluster().stopRandomNode(TestCluster.nameFilter(server_1));
         cluster().stopRandomNode(TestCluster.nameFilter(server_1));