Adjust number of replicas in YAML REST tests (#93386)

tlrx · web-flow · commit a1730019e505 · 2023-02-07T14:35:10.000+01:00
Some core yaml rest tests use an explicit number of replicas when creating indices. I suspect that this is often not needed and it prevents those tests to run in a 2 nodes (index &amp; search) cluster.

Most of the impacted tests are search related so I'll use the :Search/Search label.

Relates ES-5253
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -211,7 +211,7 @@
   - skip:
       version: " - 7.1.99"
       reason:  "closed indices are replicated starting version 7.2.0"
-      features: ["allowed_warnings"]
+      features: ["allowed_warnings", "default_shards"]
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml
@@ -6,9 +6,6 @@
   - do:
       indices.create:
         index: test_index
-        body:
-          settings:
-            number_of_replicas: 0
 
   - do:
       indices.add_block:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml
@@ -6,13 +6,11 @@
   - do:
       indices.create:
         index: test_index
-        body:
-          settings:
-            number_of_replicas: 0
 
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index]
+        wait_for_no_initializing_shards: true
 
   - do:
       indices.close:
@@ -34,7 +32,8 @@
 
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index]
+        wait_for_no_initializing_shards: true
 
   - do:
       search:
@@ -88,6 +87,7 @@
   - is_true: acknowledged
   - match: { acknowledged: true }
   - match: { shards_acknowledged: true }
+
 ---
 "Close index response with result per index":
   - skip:
@@ -96,23 +96,19 @@
   - do:
       indices.create:
         index: index_1
-        body:
-          settings:
-            number_of_replicas: 0
 
   - do:
       indices.create:
         index: index_2
-        body:
-          settings:
-            number_of_replicas: 0
 
   - do:
       indices.create:
         index: index_3
-        body:
-          settings:
-            number_of_replicas: 0
+
+  - do:
+      cluster.health:
+        index: [index_1, index_2, index_3]
+        wait_for_no_initializing_shards: true
 
   - do:
       indices.close:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
@@ -2,24 +2,19 @@ setup:
   - do:
       indices.create:
         index: test_index1
-        body:
-          settings:
-            number_of_replicas: 0
+
   - do:
       indices.create:
         index: test_index2
-        body:
-          settings:
-            number_of_replicas: 0
+
   - do:
       indices.create:
         index: test_index3
-        body:
-          settings:
-            number_of_replicas: 0
+
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index1, test_index2, test_index3]
+        wait_for_no_initializing_shards: true
 
 ---
 "All indices":
@@ -46,7 +41,8 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index1, test_index2, test_index3]
+        wait_for_no_initializing_shards: true
 
   - do:
       search:
@@ -78,7 +74,8 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index1, test_index2, test_index3]
+        wait_for_no_initializing_shards: true
 
   - do:
       search:
@@ -110,7 +107,8 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: green
+        index: [test_index1, test_index2, test_index3]
+        wait_for_no_initializing_shards: true
 
   - do:
       search:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.sort/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.sort/10_basic.yml
@@ -7,7 +7,6 @@
         body:
           settings:
             number_of_shards: 1
-            number_of_replicas: 0
             index.sort.field: rank
           mappings:
             properties:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/10_basic.yml
@@ -4,9 +4,6 @@
      indices.create:
        index:    test_1
        body:
-         settings:
-           index:
-             number_of_replicas: 0
          mappings:
            properties:
              foo:
@@ -23,10 +20,6 @@
   - do:
       indices.refresh: {}
 
-  - do:
-      cluster.health:
-           wait_for_status: green
-
   - do:
       search:
           rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/20_docs.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/20_docs.yml
@@ -3,9 +3,7 @@
   - do:
       indices.create:
         index: test_1
-        body:
-          settings:
-            number_of_replicas: 0
+
   - do:
       index:
           index:  test_1
@@ -27,10 +25,6 @@
   - do:
       indices.refresh: {}
 
-  - do:
-      cluster.health:
-           wait_for_status: green
-
   - do:
       search:
           rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/30_unlike.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mlt/30_unlike.yml
@@ -3,9 +3,7 @@
   - do:
       indices.create:
         index: test_1
-        body:
-          settings:
-            number_of_replicas: 0
+
   - do:
       index:
           index:  test_1
@@ -27,10 +25,6 @@
   - do:
       indices.refresh: {}
 
-  - do:
-      cluster.health:
-           wait_for_status: green
-
   - do:
       search:
           rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/msearch/20_typed_keys.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/msearch/20_typed_keys.yml
@@ -4,8 +4,6 @@ setup:
       indices.create:
         index: test-0
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               index_start_at:
@@ -23,8 +21,6 @@ setup:
       indices.create:
         index: test-1
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               index_start_at:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
           index: test
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               "properties":
                 "integer_range":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/12_slices.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/12_slices.yml
@@ -51,6 +51,7 @@ setup:
             match_all: {}
 
   - set: {_scroll_id: scroll_id}
+  - match: { _shards.successful: 5 }
   - match: {hits.total:      3    }
   - length: {hits.hits:      3    }
   - match: {hits.hits.0._id: "2" }
@@ -160,6 +161,7 @@ setup:
             match_all: {}
 
   - set: {_scroll_id: scroll_id}
+  - match: { _shards.successful: 5 }
   - match: { hits.total.value: 3 }
   - length: { hits.hits: 3 }
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml
@@ -22,7 +22,6 @@ setup:
   - do:
       index:
         index: test
-        refresh: true
         body:
           id : 1
           title : "The quick brown fox is brown"
@@ -31,14 +30,17 @@ setup:
   - do:
       index:
         index: test
-        refresh: true
         body:
           id : 2
           title : "The quick blue fox is blue"
           nested:
             - title: "purple octopus"
             - title: "purple fish"
 
+  - do:
+      indices.refresh:
+        index: [test]
+
 ---
 "Highlight query":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml
@@ -30,15 +30,13 @@ setup:
       index:
         index:   test
         id:      1
-        refresh: true
         body:
           foo: the quick brown fox jumped over the lazy dog
 
   - do:
       index:
         index:   test
         id:      2
-        refresh: true
         body:
           foo:
             - "To be, or not to be, that is the question:"
@@ -75,6 +73,10 @@ setup:
             - "With this regard their currents turn awry"
             - "And lose the name of action."
 
+  - do:
+      indices.refresh:
+        index: [test]
+
 ---
 keyword single plain:
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/40_knn_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/40_knn_search.yml
@@ -6,8 +6,6 @@ setup:
       indices.create:
         index: test
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               name:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/45_knn_search_byte.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/45_knn_search_byte.yml
@@ -7,8 +7,6 @@ setup:
       indices.create:
         index: test
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               name:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/60_knn_search_filter_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/60_knn_search_filter_alias.yml
@@ -9,7 +9,6 @@ setup:
         body:
           settings:
             number_of_shards: 1
-            number_of_replicas: 0
           mappings:
             dynamic: false
             properties:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml
@@ -8,7 +8,6 @@ setup:
         body:
           settings:
             index.number_of_shards: 2
-            index.number_of_replicas: 0
           mappings:
             properties:
               vector1:
@@ -32,7 +31,6 @@ setup:
         body:
           settings:
             index.number_of_shards: 2
-            index.number_of_replicas: 0
           mappings:
             properties:
               vector1:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml
@@ -7,7 +7,6 @@ setup:
           body:
             settings:
               number_of_shards: 3
-              number_of_replicas: 0
             mappings:
               properties:
                 date:
@@ -21,7 +20,6 @@ setup:
           body:
             settings:
               number_of_shards: 3
-              number_of_replicas: 0
             mappings:
               properties:
                 date:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml
@@ -7,8 +7,6 @@ setup:
       indices.create:
         index: index1
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               my_date:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/suggest/40_typed_keys.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/suggest/40_typed_keys.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml
diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
