Wait for 2 active shards, remove yellow status

Author: carlosdelest

.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml

@@ -15,6 +15,14 @@ setup:
 
   - match: { result: "created" }
 
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        wait_for_active_shards: 2
+        timeout: 1m
+
   - do:
       synonyms.get_synonym:
         id: test-update-synonyms
@@ -44,6 +52,13 @@ setup:
           synonyms_set:
             - synonyms: "other, another"
 
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        wait_for_active_shards: 2
+        timeout: 1m
+
   - match: { result: "updated" }
   - match: { reload_analyzers_details._shards.total: 0 }
   - length: { reload_analyzers_details.reload_details: 0 }
@@ -58,6 +73,13 @@ setup:
 
   - match: { result: "created" }
 
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        wait_for_active_shards: 2
+        timeout: 1m
+
   - do:
       synonyms.get_synonym:
         id: test-empty-synonyms

.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml

@@ -18,7 +18,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Get synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml

@@ -19,7 +19,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Delete synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml

@@ -9,6 +9,15 @@ setup:
           synonyms_set:
             - synonyms: "hello, hi"
             - synonyms: "goodbye, bye"
+
+  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        wait_for_active_shards: 2
+        timeout: 1m
+
   - do:
       synonyms.put_synonym:
         id: test-synonyms-1
@@ -30,16 +39,6 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        wait_for_active_shards: 2
-        timeout: 1m
-        wait_for_status: yellow
-
-
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml

@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Update a synonyms rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml

@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 20s
-        wait_for_status: yellow
 
 ---
 "Get a synonym rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 
 ---