From 9891704cf878c0ed93e90fd71265bf4f481f4ceb Mon Sep 17 00:00:00 2001 From: carlosdelest Date: Mon, 4 Nov 2024 17:47:40 +0100 Subject: [PATCH 1/4] Fix number of shards for serverless in synonyms test --- .../test/synonyms/90_synonyms_reloading_for_synset.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index 1ceb5b43b8129..a6d9eacd19b69 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -38,7 +38,6 @@ settings: index: number_of_shards: 1 - number_of_replicas: 0 analysis: filter: my_synonym_filter: @@ -72,7 +71,6 @@ settings: index: number_of_shards: 1 - number_of_replicas: 0 analysis: filter: my_synonym_filter: @@ -99,7 +97,6 @@ - '{"index": {"_index": "my_index2", "_id": "2"}}' - '{"my_field": "goodbye"}' - # An update of synonyms_set1 must trigger auto-reloading of analyzers only for synonyms_set1 - do: synonyms.put_synonym: @@ -109,8 +106,8 @@ - synonyms: "hello, salute" - synonyms: "ciao => goodbye" - match: { result: "updated" } - - match: { reload_analyzers_details._shards.total: 2 } # shard requests are still sent to 2 indices - - match: { reload_analyzers_details._shards.successful: 2 } + - gte: { reload_analyzers_details._shards.total: 2 } # shard requests are still sent to 2 indices + - gte: { reload_analyzers_details._shards.successful: 2 } - length: { reload_analyzers_details.reload_details: 1 } # reload details contain only a single index - match: { reload_analyzers_details.reload_details.0.index: "my_index1" } - match: { reload_analyzers_details.reload_details.0.reloaded_analyzers.0: "my_analyzer1" } From 6f64fe2b1f686af0d5c23e2dc39e8b9a7af8b08f Mon Sep 17 00:00:00 2001 From: carlosdelest Date: Mon, 4 Nov 2024 21:12:06 +0100 Subject: [PATCH 2/4] Adjust number of shards --- .../test/synonyms/90_synonyms_reloading_for_synset.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index a6d9eacd19b69..fe39065c2e791 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -106,8 +106,9 @@ - synonyms: "hello, salute" - synonyms: "ciao => goodbye" - match: { result: "updated" } - - gte: { reload_analyzers_details._shards.total: 2 } # shard requests are still sent to 2 indices - - gte: { reload_analyzers_details._shards.successful: 2 } + - set: { reload_analyzers_details._shards.total: total_shards } + - gte: { reload_analyzers_details._shards.total: 2 } # Shards for all indices were reloaded. On serverless this may be more as there are more replicas + - match: { reload_analyzers_details._shards.successful: $total_shards } - length: { reload_analyzers_details.reload_details: 1 } # reload details contain only a single index - match: { reload_analyzers_details.reload_details.0.index: "my_index1" } - match: { reload_analyzers_details.reload_details.0.reloaded_analyzers.0: "my_analyzer1" } From ed7508f4f44d7f98ee0c9b541241cd49c351462a Mon Sep 17 00:00:00 2001 From: carlosdelest Date: Tue, 5 Nov 2024 09:21:21 +0100 Subject: [PATCH 3/4] Fix successful shards --- .../test/synonyms/90_synonyms_reloading_for_synset.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index fe39065c2e791..bd3924c7f4e75 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -108,7 +108,7 @@ - match: { result: "updated" } - set: { reload_analyzers_details._shards.total: total_shards } - gte: { reload_analyzers_details._shards.total: 2 } # Shards for all indices were reloaded. On serverless this may be more as there are more replicas - - match: { reload_analyzers_details._shards.successful: $total_shards } + - lt: { reload_analyzers_details._shards.successful: $total_shards } # Only shards for the first index are successful - length: { reload_analyzers_details.reload_details: 1 } # reload details contain only a single index - match: { reload_analyzers_details.reload_details.0.index: "my_index1" } - match: { reload_analyzers_details.reload_details.0.reloaded_analyzers.0: "my_analyzer1" } From d604b61d91d636d7de8863a362637e2525a20b56 Mon Sep 17 00:00:00 2001 From: carlosdelest Date: Tue, 5 Nov 2024 10:20:20 +0100 Subject: [PATCH 4/4] Change checks to make them compatible with serverless --- .../test/synonyms/90_synonyms_reloading_for_synset.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index bd3924c7f4e75..ac01f2dc0178a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -106,9 +106,9 @@ - synonyms: "hello, salute" - synonyms: "ciao => goodbye" - match: { result: "updated" } - - set: { reload_analyzers_details._shards.total: total_shards } - - gte: { reload_analyzers_details._shards.total: 2 } # Shards for all indices were reloaded. On serverless this may be more as there are more replicas - - lt: { reload_analyzers_details._shards.successful: $total_shards } # Only shards for the first index are successful + - gt: { reload_analyzers_details._shards.total: 0 } + - gt: { reload_analyzers_details._shards.successful: 0 } + - match: { reload_analyzers_details._shards.failed: 0 } - length: { reload_analyzers_details.reload_details: 1 } # reload details contain only a single index - match: { reload_analyzers_details.reload_details.0.index: "my_index1" } - match: { reload_analyzers_details.reload_details.0.reloaded_analyzers.0: "my_analyzer1" }