@@ -131,17 +131,19 @@ public void setUp() throws Exception {
131131 ClusterHealthResponse response = client ().admin ().cluster ().prepareHealth ().setWaitForNodes (">=3" ).get ();
132132 assertThat (response .isTimedOut (), is (false ));
133133
134- // create an index
135- client ().admin ()
136- .indices ()
137- .prepareCreate (indexName )
138- .setSettings (
139- Settings .builder ()
140- .put (IndexMetadata .INDEX_ROUTING_INCLUDE_GROUP_SETTING .getKey () + "color" , "blue" )
141- .put (IndexMetadata .SETTING_NUMBER_OF_SHARDS , 1 )
142- .put (IndexMetadata .SETTING_NUMBER_OF_REPLICAS , 0 )
143- )
144- .get ();
134+ // create an index only if it doesn't exist
135+ if (!client ().admin ().indices ().prepareExists (indexName ).get ().isExists ()) {
136+ client ().admin ()
137+ .indices ()
138+ .prepareCreate (indexName )
139+ .setSettings (
140+ Settings .builder ()
141+ .put (IndexMetadata .INDEX_ROUTING_INCLUDE_GROUP_SETTING .getKey () + "color" , "blue" )
142+ .put (IndexMetadata .SETTING_NUMBER_OF_SHARDS , 1 )
143+ .put (IndexMetadata .SETTING_NUMBER_OF_REPLICAS , 0 )
144+ )
145+ .get ();
146+ }
145147 }
146148
147149 @ After
@@ -329,6 +331,10 @@ public void testRestartCmNode() throws Exception {
329331
330332 logger .info ("-> restarting stopped node" );
331333 internalCluster ().startNode (Settings .builder ().put ("node.name" , clusterManager ).put (cmNodeSettings ).build ());
334+
335+ // Wait for cluster to stabilize before checking node count
336+ ensureGreen ();
337+
332338 response = client ().admin ().cluster ().prepareHealth ().setWaitForNodes ("3" ).get ();
333339 assertThat (response .isTimedOut (), is (false ));
334340 }
0 commit comments