浏览代码

[TEST] Fix wait condition on testMultipleNodesShutdownNonMasterNodes

After two nodes are being stopped and two more are joining the cluster, we first have to wait on the cluster to consist of the right nodes before
waiting on green status, otherwise we might get a green status for a cluster with dead nodes.
Yannick Welsch 8 年之前
父节点
当前提交
12471c4f76
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java

+ 1 - 1
core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java

@@ -248,8 +248,8 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
         logger.info("--> start back the 2 nodes ");
         logger.info("--> start back the 2 nodes ");
         String[] newNodes = internalCluster().startNodes(2, settings).stream().toArray(String[]::new);
         String[] newNodes = internalCluster().startNodes(2, settings).stream().toArray(String[]::new);
 
 
-        ensureGreen();
         internalCluster().validateClusterFormed();
         internalCluster().validateClusterFormed();
+        ensureGreen();
 
 
         state = client().admin().cluster().prepareState().execute().actionGet().getState();
         state = client().admin().cluster().prepareState().execute().actionGet().getState();
         assertThat(state.nodes().getSize(), equalTo(4));
         assertThat(state.nodes().getSize(), equalTo(4));