Prepare aggregation yaml tests to be included in serverless build. (#…

…99413) * Remove setting the number of replicas in aggregation yaml tests. * Stop waiting for yellow/green. The create index request by default return s when at least the primary shard has been assigned. * Adjust assertions that are sensitive to the number of shard copies. * Muted 4 aggregation yaml tests in mixed cluster qa ([link](https://github.com/elastic/elasticsearch/pull/99413/files#diff-033fa895a9866248015cbe7871deab0b3c88fa66a5e1bc9e789079d0d1a39f24R31)). These tests assert cache hits and with replicas we currently can't reliable assert this in a multi node test cluster. Like the mentioned comment suggest if the node selector can reliable select the same node, then we can unmute. I think muting is ok for now. These yaml tests are run in aggregation module and will soon be run in serverless. I think enforcing that many yaml tests run tests against indices with no replicas is worse for test coverage than muting 4 yaml tests in this qa module. Additionally I think that testing that the request cache work should not be tested in full blown integration tests, but more targeted unit/semi integration tests.
elastic · Sep 13, 2023 · a97915f · a97915f
1 parent b1da97a
commit a97915f
Show file tree

Hide file tree

Showing 42 changed files with 42 additions and 174 deletions.
diff --git a/...regations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml b/...regations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml
@@ -5,7 +5,6 @@ setup:
           body:
             settings:
               number_of_shards: 1
-              number_of_replicas: 0
             mappings:
               properties:
                 num:
@@ -75,7 +74,6 @@ setup:
           body:
             settings:
               number_of_shards: 1
-              number_of_replicas: 0
             mappings:
               properties:
                 num:
@@ -97,6 +95,7 @@ setup:
         version: current # the version of the node that parsed the request is part of the cache key.
       search:
         index: test
+        preference: hit-same-shard-copy
         body:
           size: 0
           aggs:
@@ -140,7 +139,7 @@ setup:
 
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 0 }
   - match: { indices.test.total.request_cache.miss_count: 1 }
 
@@ -150,6 +149,7 @@ setup:
         version: current # the version of the node that parsed the request is part of the cache key.
       search:
         index: test
+        preference: hit-same-shard-copy
         body:
           size: 0
           aggs:
@@ -176,6 +176,6 @@ setup:
                         path: num
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 1 }
   - match: { indices.test.total.request_cache.miss_count: 1 }
diff --git a/...ations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml b/...ations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml
@@ -5,7 +5,6 @@ setup:
           body:
             settings:
               number_of_shards: 1
-              number_of_replicas: 0
             mappings:
               properties:
                 date:
@@ -105,8 +104,6 @@ setup:
       indices.create:
         index: date_field_type_date
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:
@@ -116,8 +113,6 @@ setup:
       indices.create:
         index: date_field_type_date_nanos
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:

diff --git a/...es/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/avg_metric.yml b/...es/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/avg_metric.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
           index: test_1
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               properties:
                 int_field:
@@ -47,8 +45,6 @@ setup:
       indices.create:
         index: test_2
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               other_field:

diff --git a/...gations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml b/...gations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
           index: test_1
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               properties:
                 int_field:
@@ -47,8 +45,6 @@ setup:
       indices.create:
         index: test_2
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               other_field:

diff --git a/...les/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml b/...les/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml
@@ -66,8 +66,6 @@ setup:
       indices.create:
         index: date_histogram_timezone_test
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date:
@@ -1621,8 +1619,6 @@ setup:
       indices.create:
         index: date_field_type_date
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:
@@ -1632,8 +1628,6 @@ setup:
       indices.create:
         index: date_field_type_date_nanos
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:

diff --git a/...regations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite_sorted.yml b/...regations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite_sorted.yml
@@ -13,7 +13,6 @@ setup:
           settings:
             index:
               number_of_shards: 1
-              number_of_replicas: 0
               sort:
                 field: date
                 order: desc

diff --git a/...ggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml b/...ggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml
@@ -25,8 +25,6 @@ setup:
       indices.create:
         index: date_histogram_timezone_test
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date:
@@ -36,8 +34,6 @@ setup:
       indices.create:
         index: test_timezone_date_nanos
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date:
@@ -47,8 +43,6 @@ setup:
       indices.create:
         index: timezone_daylight_test
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date:
@@ -499,8 +493,6 @@ setup:
       indices.create:
         index: date_field_type_date
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:
@@ -510,8 +502,6 @@ setup:
       indices.create:
         index: date_field_type_date_nanos
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               date_field:

diff --git a/...es/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml b/...es/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
           index: old_test
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               properties:
                 date:
@@ -15,24 +13,18 @@ setup:
       indices.create:
           index: test
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               properties:
                 date:
                   type: date
                   format: epoch_second
 
-  - do:
-      cluster.health:
-        wait_for_status: yellow
-
 # March 8th 2020 was the start of daylight savings time that year
   - do:
       bulk:
         index: test
         refresh: true
-        body: 
+        body:
           - {"index": {}}
           - { "date" : "2020-03-08T06:15:00Z" }
           - {"index": {}}
@@ -44,7 +36,7 @@ setup:
       bulk:
         index: old_test
         refresh: true
-        body: 
+        body:
           - {"index": {}}
           - { "date" : 1000 }
           - {"index": {}}
@@ -56,15 +48,15 @@ setup:
       search:
         body:
           size: 0
-          aggs: 
-            date_range: 
-              date_range: 
+          aggs:
+            date_range:
+              date_range:
                 field: "date"
-                ranges: 
-                  - 
+                ranges:
+                  -
                     from: 1000
                     to: 3000
-                  - 
+                  -
                     from: 3000
                     to: 4000
 
@@ -141,7 +133,6 @@ setup:
           body:
             settings:
               number_of_shards: 1
-              number_of_replicas: 0
   - do:
       search:
         index: test_a_unmapped

diff --git a/...gregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml b/...gregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
         index: test_1
         body:
-          settings:
-            number_of_replicas: 0
           mappings:
             properties:
               str:

diff --git a/...ions/src/yamlRestTest/resources/rest-api-spec/test/aggregations/extended_stats_metric.yml b/...ions/src/yamlRestTest/resources/rest-api-spec/test/aggregations/extended_stats_metric.yml
@@ -3,8 +3,6 @@ setup:
       indices.create:
           index: test_1
           body:
-            settings:
-              number_of_replicas: 0
             mappings:
               properties:
                 int_field:

diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml
@@ -5,7 +5,6 @@ setup:
           body:
             settings:
               number_of_shards: 1
-              number_of_replicas: 0
             mappings:
               properties:
                 mentions:
@@ -35,6 +34,7 @@ setup:
         rest_total_hits_as_int: true
         size: 0
         request_cache: true
+        preference: hit-same-shard-copy
         body:
           aggs:
             itemsNotify:
@@ -58,7 +58,7 @@ setup:
   # The first request will miss the cache
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 0 }
   - match: { indices.test.total.request_cache.miss_count: 1 }
 
@@ -69,6 +69,7 @@ setup:
         rest_total_hits_as_int: true
         size: 0
         request_cache: true
+        preference: hit-same-shard-copy
         body:
           aggs:
             itemsNotify:
@@ -92,7 +93,7 @@ setup:
   # The second result with hit the cache
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 1 }
   - match: { indices.test.total.request_cache.miss_count: 1 }
 
@@ -108,6 +109,7 @@ setup:
         rest_total_hits_as_int: true
         size: 0
         request_cache: true
+        preference: hit-same-shard-copy
         body:
           aggs:
             itemsNotify:
@@ -128,7 +130,7 @@ setup:
   # The first request will miss the cache
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 0 }
   - match: { indices.test.total.request_cache.miss_count: 1 }
   - is_true: indices.test
@@ -141,6 +143,7 @@ setup:
         rest_total_hits_as_int: true
         size: 0
         request_cache: true
+        preference: hit-same-shard-copy
         body:
           aggs:
             itemsNotify:
@@ -161,7 +164,7 @@ setup:
   # The first request will miss the cache
   - do:
       indices.stats: { index: test, metric: request_cache}
-  - match: { _shards.total: 1 }
+  - gte: { _shards.total: 1 }
   - match: { indices.test.total.request_cache.hit_count: 1 }
   - match: { indices.test.total.request_cache.miss_count: 1 }