From 438f9ad2d44f0d77371dc96dc4c0e717721ad91a Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 18:12:26 +0200
Subject: [PATCH 01/30] Fixes synonyms CI issues for serverless

---
 muted-tests.yml                                          | 9 ---------
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml | 8 ++++++++
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml      | 7 +++++++
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml   | 8 ++++++++
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml | 9 +++++++++
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml  | 7 +++++++
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml  | 7 +++++--
 .../test/synonyms/70_synonym_rule_delete.yml             | 9 +++++++++
 .../test/synonyms/80_synonyms_from_index.yml             | 8 ++++++++
 .../test/synonyms/90_synonyms_reloading_for_synset.yml   | 8 ++++++++
 10 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 51d74f12e4925..5047f077caf94 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -354,15 +354,6 @@ tests:
 - class: org.elasticsearch.xpack.inference.DefaultElserIT
   method: testInferCreatesDefaultElser
   issue: https://github.com/elastic/elasticsearch/issues/114503
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Synonym set not found}
-  issue: https://github.com/elastic/elasticsearch/issues/114432
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Get a synonym rule}
-  issue: https://github.com/elastic/elasticsearch/issues/114443
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Synonym rule not found}
-  issue: https://github.com/elastic/elasticsearch/issues/114444
 - class: org.elasticsearch.xpack.inference.integration.ModelRegistryIT
   method: testGetModel
   issue: https://github.com/elastic/elasticsearch/issues/114657
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index d3d0a3bb4df70..72f66d10339f8 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -11,6 +11,14 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   - do:
       indices.create:
         index: test_index
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 3494f33466ce4..aa8ea8880ae89 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -14,6 +14,13 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 351ff4e186d8a..a2a136fe74a07 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -12,6 +12,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
 ---
 "Delete synonyms set":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 723c41e163eb8..c973b87ef2216 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -30,6 +30,15 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
+
 ---
 teardown:
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index f3711bb0774ca..fa617ca582f42 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -14,6 +14,13 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 2a7c8aff89d8e..ef7e9b87e25ff 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -13,10 +13,13 @@ setup:
               id: "test-id-2"
             - synonyms: "test => check"
               id: "test-id-3"
+
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms
-        timeout: 1m
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index a4853b0b6d414..e5fd330a2bc35 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -14,6 +14,15 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
+
 ---
 "Delete synonym rule":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 89ad933370e1c..a844058ef5c57 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -14,6 +14,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   # Create an index with synonym_filter that uses that synonyms set
   - do:
       indices.create:
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 dc94b36222402..6770288ac4314 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
@@ -26,6 +26,14 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:
       indices.create:

From 7641f2be0e18b70ff34eb0c5c9b37aa0e919c20d Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 20:15:22 +0200
Subject: [PATCH 02/30] Change timeout

---
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml        | 2 +-
 .../resources/rest-api-spec/test/synonyms/20_synonyms_get.yml   | 2 +-
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml          | 2 +-
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml        | 2 +-
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml         | 2 +-
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml         | 2 +-
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml      | 2 +-
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml      | 2 +-
 .../test/synonyms/90_synonyms_reloading_for_synset.yml          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index 72f66d10339f8..cec9f0d44305f 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -16,7 +16,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index aa8ea8880ae89..9440f84f84983 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index a2a136fe74a07..2ffd42e4452da 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -17,7 +17,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index c973b87ef2216..133b620c579a4 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -35,7 +35,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index fa617ca582f42..7220e4ee8e3b7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index ef7e9b87e25ff..db5ae23e1a944 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index e5fd330a2bc35..d0f6bfa97b048 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index a844058ef5c57..c0ad1dae27866 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   # Create an index with synonym_filter that uses that synonyms set
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 6770288ac4314..c86a634f944ea 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
@@ -31,7 +31,7 @@
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   # Create my_index1 with synonym_filter that uses synonyms_set1

From 92bf1d00fc83912339ede981fb7a910f7c4c488b Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 14 Oct 2024 19:34:58 +0200
Subject: [PATCH 03/30] Change status and wait for active shards

---
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml   | 5 +++--
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml        | 5 +++--
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml     | 5 +++--
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml   | 5 +++--
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml    | 5 +++--
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml    | 7 ++++---
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml | 5 +++--
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml | 5 +++--
 .../test/synonyms/90_synonyms_reloading_for_synset.yml     | 5 +++--
 9 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index cec9f0d44305f..b0559e9fa3653 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -11,13 +11,14 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 9440f84f84983..64ad932b40381 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 2ffd42e4452da..f17d4fdfbc0e2 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -12,13 +12,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Delete synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 133b620c579a4..aa1c699f12120 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -30,13 +30,14 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 7220e4ee8e3b7..8cb406b9918d7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index db5ae23e1a944..1f5a59338e80b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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
-        timeout: 1m
-        wait_for_status: green
+        wait_for_active_shards: 2
+        timeout: 20s
+        wait_for_status: yellow
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index d0f6bfa97b048..177c5df32a79e 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index c0ad1dae27866..3b6fc352716a1 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 c86a634f944ea..bd63b12c21f8d 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
@@ -26,13 +26,14 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From df817e72b0c7de7e1c4288520dc6329b293a38d3 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 15 Oct 2024 08:14:07 +0200
Subject: [PATCH 04/30] Wait for 2 active shards, remove yellow status

---
 .../Debug_Elasticsearch__node_2_.xml          |  6 ++++-
 .../Debug_Elasticsearch__node_3_.xml          |  6 ++++-
 .../test/synonyms/10_synonyms_put.yml         | 22 +++++++++++++++++++
 .../test/synonyms/110_synonyms_invalid.yml    |  1 -
 .../test/synonyms/20_synonyms_get.yml         |  1 -
 .../test/synonyms/30_synonyms_delete.yml      |  1 -
 .../test/synonyms/40_synonyms_sets_get.yml    | 19 ++++++++--------
 .../test/synonyms/50_synonym_rule_put.yml     |  1 -
 .../test/synonyms/60_synonym_rule_get.yml     |  1 -
 .../test/synonyms/70_synonym_rule_delete.yml  |  1 -
 .../test/synonyms/80_synonyms_from_index.yml  |  1 -
 .../90_synonyms_reloading_for_synset.yml      |  1 -
 12 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index 94bb079398ffd..587ec883c00f5 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5008" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5008" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index aaef20fec729b..2a82837c0cb44 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5009" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5009" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index bcd58f3f7bd64..ae6f84faa4ed4 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -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
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index b0559e9fa3653..d344fbccbd398 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -18,7 +18,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 64ad932b40381..6982787260cd5 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index f17d4fdfbc0e2..ce206512f3ce7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -19,7 +19,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Delete synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index aa1c699f12120..805cf645cef43 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_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:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 8cb406b9918d7..281ca2e9db8ab 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/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
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 1f5a59338e80b..7aee0f5b92026 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 20s
-        wait_for_status: yellow
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index 177c5df32a79e..5d83037074434 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 3b6fc352716a1..926140fe2e28b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 bd63b12c21f8d..0876481280b3f 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
@@ -33,7 +33,6 @@
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From d4bd80a959c1e5b3e3f4ecdcef921ce0ae3a5a51 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 15 Oct 2024 08:15:37 +0200
Subject: [PATCH 05/30] Revert run config changes

---
 .idea/runConfigurations/Debug_Elasticsearch__node_2_.xml | 4 ----
 .idea/runConfigurations/Debug_Elasticsearch__node_3_.xml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index 587ec883c00f5..e3328d2324613 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -6,10 +6,6 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5008" />
     <option name="AUTO_RESTART" value="true" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5008" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index 2a82837c0cb44..b6432bb83e937 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -6,10 +6,6 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5009" />
     <option name="AUTO_RESTART" value="true" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5009" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
     <method v="2" />
   </configuration>
 </component>

From 53b85b2bd9d7e59467c9f63060d098bc70abfb0d Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 18:12:26 +0200
Subject: [PATCH 06/30] Fixes synonyms CI issues for serverless

---
 muted-tests.yml                                          | 9 ---------
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml | 8 ++++++++
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml      | 7 +++++++
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml   | 8 ++++++++
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml | 9 +++++++++
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml  | 7 +++++++
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml  | 7 +++++--
 .../test/synonyms/70_synonym_rule_delete.yml             | 9 +++++++++
 .../test/synonyms/80_synonyms_from_index.yml             | 8 ++++++++
 .../test/synonyms/90_synonyms_reloading_for_synset.yml   | 8 ++++++++
 10 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 69cef9acc8cb9..1d909c578e866 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -294,15 +294,6 @@ tests:
 - class: org.elasticsearch.xpack.inference.DefaultElserIT
   method: testInferCreatesDefaultElser
   issue: https://github.com/elastic/elasticsearch/issues/114503
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Synonym set not found}
-  issue: https://github.com/elastic/elasticsearch/issues/114432
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Get a synonym rule}
-  issue: https://github.com/elastic/elasticsearch/issues/114443
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
-  method: test {p0=synonyms/60_synonym_rule_get/Synonym rule not found}
-  issue: https://github.com/elastic/elasticsearch/issues/114444
 - class: org.elasticsearch.xpack.inference.integration.ModelRegistryIT
   method: testGetModel
   issue: https://github.com/elastic/elasticsearch/issues/114657
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index d3d0a3bb4df70..72f66d10339f8 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -11,6 +11,14 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   - do:
       indices.create:
         index: test_index
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 3494f33466ce4..aa8ea8880ae89 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -14,6 +14,13 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 351ff4e186d8a..a2a136fe74a07 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -12,6 +12,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
 ---
 "Delete synonyms set":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 723c41e163eb8..c973b87ef2216 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -30,6 +30,15 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
+
 ---
 teardown:
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index f3711bb0774ca..fa617ca582f42 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -14,6 +14,13 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 2a7c8aff89d8e..ef7e9b87e25ff 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -13,10 +13,13 @@ setup:
               id: "test-id-2"
             - synonyms: "test => check"
               id: "test-id-3"
+
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms
-        timeout: 1m
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index a4853b0b6d414..e5fd330a2bc35 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -14,6 +14,15 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
+
 ---
 "Delete synonym rule":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 89ad933370e1c..a844058ef5c57 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -14,6 +14,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   # Create an index with synonym_filter that uses that synonyms set
   - do:
       indices.create:
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 dc94b36222402..6770288ac4314 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
@@ -26,6 +26,14 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:
       indices.create:

From 1c51d572520134efbadaaa118d8d92597cbfebe5 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 20:15:22 +0200
Subject: [PATCH 07/30] Change timeout

---
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml        | 2 +-
 .../resources/rest-api-spec/test/synonyms/20_synonyms_get.yml   | 2 +-
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml          | 2 +-
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml        | 2 +-
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml         | 2 +-
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml         | 2 +-
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml      | 2 +-
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml      | 2 +-
 .../test/synonyms/90_synonyms_reloading_for_synset.yml          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index 72f66d10339f8..cec9f0d44305f 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -16,7 +16,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index aa8ea8880ae89..9440f84f84983 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index a2a136fe74a07..2ffd42e4452da 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -17,7 +17,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index c973b87ef2216..133b620c579a4 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -35,7 +35,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index fa617ca582f42..7220e4ee8e3b7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index ef7e9b87e25ff..db5ae23e1a944 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index e5fd330a2bc35..d0f6bfa97b048 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index a844058ef5c57..c0ad1dae27866 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   # Create an index with synonym_filter that uses that synonyms set
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 6770288ac4314..c86a634f944ea 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
@@ -31,7 +31,7 @@
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
   # Create my_index1 with synonym_filter that uses synonyms_set1

From 90f37bfe9516a1ed7aa7b5e7a62e3fd5e565e9a8 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 14 Oct 2024 19:34:58 +0200
Subject: [PATCH 08/30] Change status and wait for active shards

---
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml   | 5 +++--
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml        | 5 +++--
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml     | 5 +++--
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml   | 5 +++--
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml    | 5 +++--
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml    | 7 ++++---
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml | 5 +++--
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml | 5 +++--
 .../test/synonyms/90_synonyms_reloading_for_synset.yml     | 5 +++--
 9 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index cec9f0d44305f..b0559e9fa3653 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -11,13 +11,14 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 9440f84f84983..64ad932b40381 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 2ffd42e4452da..f17d4fdfbc0e2 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -12,13 +12,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Delete synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 133b620c579a4..aa1c699f12120 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -30,13 +30,14 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 7220e4ee8e3b7..8cb406b9918d7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index db5ae23e1a944..1f5a59338e80b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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
-        timeout: 1m
-        wait_for_status: green
+        wait_for_active_shards: 2
+        timeout: 20s
+        wait_for_status: yellow
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index d0f6bfa97b048..177c5df32a79e 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index c0ad1dae27866..3b6fc352716a1 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -14,13 +14,14 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 c86a634f944ea..bd63b12c21f8d 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
@@ -26,13 +26,14 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  # 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: green
+        wait_for_status: yellow
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From aa7678395e91ecc132902d788d28f1fbc7024092 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 15 Oct 2024 08:14:07 +0200
Subject: [PATCH 09/30] Wait for 2 active shards, remove yellow status

---
 .../Debug_Elasticsearch__node_2_.xml          |  6 ++++-
 .../Debug_Elasticsearch__node_3_.xml          |  6 ++++-
 .../test/synonyms/10_synonyms_put.yml         | 22 +++++++++++++++++++
 .../test/synonyms/110_synonyms_invalid.yml    |  1 -
 .../test/synonyms/20_synonyms_get.yml         |  1 -
 .../test/synonyms/30_synonyms_delete.yml      |  1 -
 .../test/synonyms/40_synonyms_sets_get.yml    | 19 ++++++++--------
 .../test/synonyms/50_synonym_rule_put.yml     |  1 -
 .../test/synonyms/60_synonym_rule_get.yml     |  1 -
 .../test/synonyms/70_synonym_rule_delete.yml  |  1 -
 .../test/synonyms/80_synonyms_from_index.yml  |  1 -
 .../90_synonyms_reloading_for_synset.yml      |  1 -
 12 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index 94bb079398ffd..587ec883c00f5 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5008" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5008" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index aaef20fec729b..2a82837c0cb44 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5009" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5009" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index bcd58f3f7bd64..ae6f84faa4ed4 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -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
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index b0559e9fa3653..d344fbccbd398 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -18,7 +18,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 64ad932b40381..6982787260cd5 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index f17d4fdfbc0e2..ce206512f3ce7 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -19,7 +19,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 ---
 "Delete synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index aa1c699f12120..805cf645cef43 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_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:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 8cb406b9918d7..281ca2e9db8ab 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/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
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 1f5a59338e80b..7aee0f5b92026 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 20s
-        wait_for_status: yellow
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index 177c5df32a79e..5d83037074434 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 3b6fc352716a1..926140fe2e28b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -21,7 +21,6 @@ setup:
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 bd63b12c21f8d..0876481280b3f 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
@@ -33,7 +33,6 @@
         level: shards
         wait_for_active_shards: 2
         timeout: 1m
-        wait_for_status: yellow
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From 5041b059542a9c8982ba647d1d91a6702cb7a8d8 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 15 Oct 2024 08:15:37 +0200
Subject: [PATCH 10/30] Revert run config changes

---
 .idea/runConfigurations/Debug_Elasticsearch__node_2_.xml | 4 ----
 .idea/runConfigurations/Debug_Elasticsearch__node_3_.xml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index 587ec883c00f5..e3328d2324613 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -6,10 +6,6 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5008" />
     <option name="AUTO_RESTART" value="true" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5008" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index 2a82837c0cb44..b6432bb83e937 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -6,10 +6,6 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5009" />
     <option name="AUTO_RESTART" value="true" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5009" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
     <method v="2" />
   </configuration>
 </component>

From ca0e0e8a2fb26f566fd8f4f09149fd5b2597187d Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 18:12:26 +0200
Subject: [PATCH 11/30] Fixes synonyms CI issues for serverless

---
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 805cf645cef43..2e52e5f6482e5 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -39,6 +39,15 @@ setup:
           persistent:
             logger.org.elasticsearch.synonyms: DEBUG
 
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 10s
+        wait_for_status: green
+
+
 ---
 teardown:
   - do:

From 61b19381dee1960c40ad0c074c48f15bc5e58cf1 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 11 Oct 2024 20:15:22 +0200
Subject: [PATCH 12/30] Change timeout

---
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 2e52e5f6482e5..7e98ee12b77b6 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -44,7 +44,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 10s
+        timeout: 1m
         wait_for_status: green
 
 

From c3b5a3efc5b4c936316f32564daa48135dba6e91 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Wed, 16 Oct 2024 19:24:29 +0200
Subject: [PATCH 13/30] Change auto expand replicas for synonyms index

---
 .../elasticsearch/synonyms/SynonymsManagementAPIService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java b/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
index b14116b3d55ba..b6cb475e848e1 100644
--- a/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
+++ b/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
@@ -566,7 +566,7 @@ private static String internalSynonymRuleId(String synonymsSetId, String synonym
     static Settings settings() {
         return Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
-            .put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-all")
+            .put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1")
             .put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), SYNONYMS_INDEX_FORMAT)
             .build();
     }

From ecb05c1a42eb746232fd40bbaf9949a8575b4d7e Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Wed, 16 Oct 2024 19:35:30 +0200
Subject: [PATCH 14/30] Check index status is green vs active shards

---
 .../rest-api-spec/test/synonyms/10_synonyms_put.yml         | 6 +++---
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml    | 2 +-
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml         | 2 +-
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml      | 2 +-
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml    | 2 +-
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml     | 2 +-
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml     | 2 +-
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml  | 2 +-
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml  | 2 +-
 .../test/synonyms/90_synonyms_reloading_for_synset.yml      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index ae6f84faa4ed4..1f03c852952e2 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -20,7 +20,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   - do:
@@ -56,7 +56,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   - match: { result: "updated" }
@@ -77,7 +77,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index d344fbccbd398..aca6a1eb38fbe 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -16,7 +16,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 6982787260cd5..e89d76403d1ca 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index ce206512f3ce7..9a332c903f287 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -17,7 +17,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 7e98ee12b77b6..308c144218a7d 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -15,7 +15,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 281ca2e9db8ab..52cc3fba10e15 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 7aee0f5b92026..bb32e3f10cb14 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 20s
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index 5d83037074434..f3f0c91c6af34 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 926140fe2e28b..1bd6d17300c26 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -19,7 +19,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   # Create an index with synonym_filter that uses that synonyms set
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 0876481280b3f..d9aed96be2a9d 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
@@ -31,7 +31,7 @@
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_active_shards: 2
+        wait_for_status: green
         timeout: 1m
 
   # Create my_index1 with synonym_filter that uses synonyms_set1

From 4a01ec7269f947de56410be3e4a3bdccf5250cb9 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Wed, 16 Oct 2024 19:38:54 +0200
Subject: [PATCH 15/30] Remove unnecessary changes

---
 .idea/runConfigurations/Debug_Elasticsearch__node_2_.xml | 2 +-
 .idea/runConfigurations/Debug_Elasticsearch__node_3_.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index e3328d2324613..94bb079398ffd 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -8,4 +8,4 @@
     <option name="AUTO_RESTART" value="true" />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index b6432bb83e937..aaef20fec729b 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -8,4 +8,4 @@
     <option name="AUTO_RESTART" value="true" />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file

From bbe4c9b17104a19c1ed6b98e461883fdffbd730b Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Wed, 16 Oct 2024 20:34:53 +0200
Subject: [PATCH 16/30] No need to wait on status for put

---
 .../rest-api-spec/test/synonyms/10_synonyms_put.yml        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index 1f03c852952e2..2589b65853406 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -52,13 +52,6 @@ setup:
           synonyms_set:
             - synonyms: "other, another"
 
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        wait_for_status: green
-        timeout: 1m
-
   - match: { result: "updated" }
   - match: { reload_analyzers_details._shards.total: 0 }
   - length: { reload_analyzers_details.reload_details: 0 }

From 87bec8628e98deb835255becd1075b1c8c0160b2 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Thu, 17 Oct 2024 09:42:06 +0200
Subject: [PATCH 17/30] Increasing timeout as nothing prevents replicas from
 being allocated, except the timeout

---
 .../resources/rest-api-spec/test/synonyms/10_synonyms_put.yml | 4 ++--
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml      | 2 +-
 .../resources/rest-api-spec/test/synonyms/20_synonyms_get.yml | 2 +-
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml        | 2 +-
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml      | 4 ++--
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml       | 2 +-
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml       | 2 +-
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml    | 2 +-
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml    | 2 +-
 .../test/synonyms/90_synonyms_reloading_for_synset.yml        | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index 2589b65853406..93aa45081cd06 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -21,7 +21,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   - do:
       synonyms.get_synonym:
@@ -71,7 +71,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   - do:
       synonyms.get_synonym:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index aca6a1eb38fbe..819dbedb00a34 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -17,7 +17,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index e89d76403d1ca..807467cedd207 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -20,7 +20,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 9a332c903f287..f7806a0ef05b5 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -18,7 +18,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
 ---
 "Delete synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 308c144218a7d..025d27ccd4255 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -16,7 +16,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   - do:
       synonyms.put_synonym:
@@ -44,7 +44,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 1m
+        timeout: 2m
         wait_for_status: green
 
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 52cc3fba10e15..b5c8240dc31ac 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -20,7 +20,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
 ---
 "Update a synonyms rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index bb32e3f10cb14..90cee57b7e26b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -20,7 +20,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 20s
+        timeout: 2m
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index f3f0c91c6af34..da1ee0e68ecfc 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -20,7 +20,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 1bd6d17300c26..b7f6136acc4e0 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -20,7 +20,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 d9aed96be2a9d..35bd7a75a545e 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
@@ -32,7 +32,7 @@
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 1m
+        timeout: 2m
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From 6d5c21b7aeb2897b8fe8c6352943f3ab8573841a Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Thu, 17 Oct 2024 12:42:32 +0200
Subject: [PATCH 18/30] Trying to get more info out of the errors

---
 .../test/synonyms/60_synonym_rule_get.yml      | 18 ++++++++++++++++--
 .../test/rest/yaml/ClientYamlTestClient.java   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 90cee57b7e26b..e54a682cd9ce1 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -14,13 +14,27 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch.cluster: TRACE
+
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_status: green
         timeout: 2m
+        wait_for_status: green
+
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch.cluster: INFO
 
 ---
 "Get a synonym rule":
diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
index 47f0df776b4cd..f5006d29c20db 100644
--- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
+++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
@@ -195,6 +195,7 @@ public ClientYamlTestResponse callApi(
             Response response = getRestClient(nodeSelector).performRequest(request);
             return new ClientYamlTestResponse(response);
         } catch (ResponseException e) {
+            logger.error("error calling api [{}], nodeSelector {}", apiName, nodeSelector, e);
             throw new ClientYamlTestResponseException(e);
         }
     }

From df3ec1f2d6ed5f880e4d2e5146b35ab78435f2c9 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Thu, 17 Oct 2024 13:40:09 +0200
Subject: [PATCH 19/30] Fix error message

---
 .../org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
index f5006d29c20db..ddcbae1e42512 100644
--- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
+++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
@@ -195,7 +195,7 @@ public ClientYamlTestResponse callApi(
             Response response = getRestClient(nodeSelector).performRequest(request);
             return new ClientYamlTestResponse(response);
         } catch (ResponseException e) {
-            logger.error("error calling api [{}], nodeSelector {}", apiName, nodeSelector, e);
+            logger.error("error calling api [{}], nodeSelector {}", apiName, nodeSelector);
             throw new ClientYamlTestResponseException(e);
         }
     }

From a3369ef16259727f1b34655af28447a33c34fc83 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Thu, 17 Oct 2024 18:58:06 +0200
Subject: [PATCH 20/30] Add cluster alloc explain

---
 .../test/synonyms/60_synonym_rule_get.yml      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index e54a682cd9ce1..67c76292e5ab3 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -18,14 +18,26 @@ setup:
       cluster.put_settings:
         body:
           persistent:
-            logger.org.elasticsearch.cluster: TRACE
+            logger.org.elasticsearch: DEBUG
 
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 2m
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 20s
         wait_for_status: green
 
 ---
@@ -34,7 +46,7 @@ teardown:
       cluster.put_settings:
         body:
           persistent:
-            logger.org.elasticsearch.cluster: INFO
+            logger.org.elasticsearch: INFO
 
 ---
 "Get a synonym rule":

From 7f7a4af35e67336cf77ae1b6706d0f10ea2d8b01 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 18 Oct 2024 07:45:46 +0200
Subject: [PATCH 21/30] Add logging and shard allocation explain

---
 .../test/synonyms/10_synonyms_put.yml         | 14 +-------
 .../test/synonyms/110_synonyms_invalid.yml    | 30 +++++++++++++++--
 .../test/synonyms/20_synonyms_get.yml         | 32 +++++++++++++++++--
 .../test/synonyms/30_synonyms_delete.yml      | 30 +++++++++++++++--
 .../test/synonyms/40_synonyms_sets_get.yml    | 28 +++++++++++++---
 .../test/synonyms/50_synonym_rule_put.yml     | 30 +++++++++++++++--
 .../test/synonyms/60_synonym_rule_get.yml     | 14 ++++----
 .../test/synonyms/70_synonym_rule_delete.yml  | 29 +++++++++++++++--
 .../test/synonyms/80_synonyms_from_index.yml  | 30 +++++++++++++++--
 .../90_synonyms_reloading_for_synset.yml      | 30 +++++++++++++++--
 10 files changed, 227 insertions(+), 40 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index 93aa45081cd06..e0194fb28711d 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -15,18 +15,6 @@ 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_status: green
-        timeout: 2m
-
-  - do:
-      synonyms.get_synonym:
-        id: test-update-synonyms
-
   - is_true: synonyms_set.0.id
   - is_true: synonyms_set.1.id
 
@@ -71,7 +59,7 @@ setup:
         index: .synonyms-2
         level: shards
         wait_for_status: green
-        timeout: 2m
+        timeout: 30s
 
   - do:
       synonyms.get_synonym:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index 819dbedb00a34..640148ce336e2 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -2,6 +2,19 @@ setup:
   - requires:
       cluster_features: ["gte_v8.16.0"]
       reason: Lenient handling of updateable synonyms by default is introduced in 8.16.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
 ---
 "Load index with an invalid synonym rule":
   - do:
@@ -11,13 +24,26 @@ setup:
           synonyms_set:
             synonyms: "foo => bar, baz"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 807467cedd207..b87480733d562 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -2,6 +2,13 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+
   - do:
       synonyms.put_synonym:
         id: test-get-synonyms
@@ -14,13 +21,26 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
 ---
 "Get synonyms set":
@@ -38,7 +58,13 @@ setup:
           id: "test-id-2"
         - synonyms: "test => check"
           id: "test-id-3"
-
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
 ---
 "Get synonyms set - not found":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index f7806a0ef05b5..474d2b54f1811 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -2,6 +2,13 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+
   - do:
       synonyms.put_synonym:
         id: test-get-synonyms
@@ -12,14 +19,33 @@ setup:
             - synonyms: "bye => goodbye"
               id: "test-id-2"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 60s
         wait_for_status: green
-        timeout: 2m
+        ignore: 408
 
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 20s
+        wait_for_status: green
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
 ---
 "Delete synonyms set":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 025d27ccd4255..fb56bdc4d3825 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -2,6 +2,13 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+
   - do:
       synonyms.put_synonym:
         id: test-synonyms-3
@@ -10,13 +17,26 @@ setup:
             - 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.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
   - do:
       synonyms.put_synonym:
@@ -44,7 +64,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        timeout: 2m
+        timeout: 30s
         wait_for_status: green
 
 
@@ -54,7 +74,7 @@ teardown:
       cluster.put_settings:
         body:
           persistent:
-            logger.org.elasticsearch.synonyms: null
+            logger.org.elasticsearch: INFO
 ---
 "List synonyms set":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index b5c8240dc31ac..c0cd866283556 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -2,6 +2,13 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+
   - do:
       synonyms.put_synonym:
         id: test-synonyms
@@ -14,14 +21,33 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 60s
         wait_for_status: green
-        timeout: 2m
+        ignore: 408
 
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 20s
+        wait_for_status: green
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
 ---
 "Update a synonyms rule":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 67c76292e5ab3..9e952da83e700 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -2,6 +2,13 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
+
   - do:
       synonyms.put_synonym:
         id: test-synonyms
@@ -14,12 +21,6 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
-
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
@@ -32,6 +33,7 @@ setup:
   - do:
       cluster.allocation_explain:
         body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
 
   - do:
       cluster.health:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index da1ee0e68ecfc..308b8a0d18868 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -2,6 +2,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
   - do:
       synonyms.put_synonym:
         id: test-synonyms
@@ -14,13 +19,26 @@ setup:
             - synonyms: "test => check"
               id: "test-id-3"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
 
 ---
@@ -52,6 +70,13 @@ setup:
           id: "test-id-1"
         - synonyms: "test => check"
           id: "test-id-3"
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
 
 ---
 "Delete synonym rule - missing synonym set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index b7f6136acc4e0..5fdb780df71c2 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -2,7 +2,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Loading synonyms from index is introduced in 8.10.0
-
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
   # Create a new synonyms set
   - do:
       synonyms.put_synonym:
@@ -14,13 +18,26 @@ setup:
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
@@ -56,6 +73,13 @@ setup:
           - '{"index": {"_index": "my_index", "_id": "2"}}'
           - '{"my_field": "goodbye"}'
 ---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO
+---
 "Load synonyms from index for an analyzer":
 
   # Confirm that synonyms from the synonyms set are used
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 35bd7a75a545e..567a4fc8cf0c3 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
@@ -3,7 +3,11 @@
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Reloading analyzers for specific synonym set is introduced in 8.10.0
-
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: DEBUG
   # Create synonyms_set1
   - do:
       synonyms.put_synonym:
@@ -26,13 +30,26 @@
             - synonyms: "bye => goodbye"
               id: "synonym-rule-2"
 
-  # This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
+  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: green
+        ignore: 408
+
+  - do:
+      cluster.allocation_explain:
+        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
+        ignore: 400
+
   - do:
       cluster.health:
         index: .synonyms-2
         level: shards
+        timeout: 20s
         wait_for_status: green
-        timeout: 2m
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:
@@ -140,3 +157,10 @@
               my_field:
                 query: salute
   - match: { hits.total.value: 0 }
+---
+teardown:
+  - do:
+      cluster.put_settings:
+        body:
+          persistent:
+            logger.org.elasticsearch: INFO

From 71acb0ee17f7c7f8ecf592d6bea2b7e591388e7c Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 21 Oct 2024 17:13:41 +0200
Subject: [PATCH 22/30] Check with wait_for_no_initializing_shards

---
 .../test/synonyms/10_synonyms_put.yml         |  5 +++--
 .../test/synonyms/110_synonyms_invalid.yml    | 16 ++-------------
 .../test/synonyms/20_synonyms_get.yml         | 16 ++-------------
 .../test/synonyms/30_synonyms_delete.yml      | 16 ++-------------
 .../test/synonyms/40_synonyms_sets_get.yml    | 20 ++++---------------
 .../test/synonyms/50_synonym_rule_put.yml     | 16 ++-------------
 .../test/synonyms/60_synonym_rule_get.yml     | 16 ++-------------
 .../test/synonyms/70_synonym_rule_delete.yml  | 17 ++--------------
 .../test/synonyms/80_synonyms_from_index.yml  | 16 ++-------------
 .../90_synonyms_reloading_for_synset.yml      | 16 ++-------------
 10 files changed, 23 insertions(+), 131 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index e0194fb28711d..bae2eece9b5c3 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -58,8 +58,9 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_status: green
-        timeout: 30s
+        imeout: 60s
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true        t
 
   - do:
       synonyms.get_synonym:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index 640148ce336e2..0d8d415f2d922 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -30,20 +30,8 @@ teardown:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index b87480733d562..43d49a0b48c83 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 "Get synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 474d2b54f1811..587f6bf5b5672 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -25,20 +25,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 ---
 teardown:
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index fb56bdc4d3825..5c773a8c3c69d 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -23,20 +23,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   - do:
       synonyms.put_synonym:
@@ -65,8 +53,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 30s
-        wait_for_status: green
-
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index c0cd866283556..d56f83e0e01b3 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 ---
 teardown:
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 9e952da83e700..ad509a6489da8 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index 308b8a0d18868..5d6c5e1ed4731 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -25,21 +25,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
-
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 "Delete synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 5fdb780df71c2..cc15202ca5173 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -24,20 +24,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:
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 567a4fc8cf0c3..b4a8446e2fedc 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
@@ -36,20 +36,8 @@
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

From 7592917b3badabf65390565b75e995fedea5e4b9 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 21 Oct 2024 17:50:53 +0200
Subject: [PATCH 23/30] Crossing my t's

---
 .../resources/rest-api-spec/test/synonyms/10_synonyms_put.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index bae2eece9b5c3..b4220cb2f6cef 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -58,7 +58,7 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        imeout: 60s
+        timeout: 60s
         wait_for_status: yellow
         wait_for_no_initializing_shards: true        t
 

From 83337d4fc0c26d4987c0bc6a707df0eeafb044fd Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 21 Oct 2024 19:14:55 +0200
Subject: [PATCH 24/30] Seriously...

---
 .../resources/rest-api-spec/test/synonyms/10_synonyms_put.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index b4220cb2f6cef..a8ef6323f1210 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -60,7 +60,7 @@ setup:
         level: shards
         timeout: 60s
         wait_for_status: yellow
-        wait_for_no_initializing_shards: true        t
+        wait_for_no_initializing_shards: true
 
   - do:
       synonyms.get_synonym:

From 8fff92a31e950db5a6bf218effbfb923af3a2577 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Mon, 21 Oct 2024 20:53:04 +0200
Subject: [PATCH 25/30] Fix test

---
 .../rest-api-spec/test/synonyms/10_synonyms_put.yml  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index a8ef6323f1210..7fdfb9c79911b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -15,6 +15,18 @@ setup:
 
   - match: { result: "created" }
 
+  - do:
+      cluster.health:
+        index: .synonyms-2
+        level: shards
+        timeout: 60s
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
+
+  - do:
+      synonyms.get_synonym:
+        id: test-update-synonyms
+
   - is_true: synonyms_set.0.id
   - is_true: synonyms_set.1.id
 

From b9b82b80c3d16bba84c2c5d829a42bcc38e111f0 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 22 Oct 2024 11:39:08 +0200
Subject: [PATCH 26/30] Remove wait_for_status

---
 .../resources/rest-api-spec/test/synonyms/10_synonyms_put.yml   | 2 --
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml        | 1 -
 .../resources/rest-api-spec/test/synonyms/20_synonyms_get.yml   | 1 -
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml          | 1 -
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml        | 2 --
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml         | 1 -
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml         | 1 -
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml      | 1 -
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml      | 1 -
 .../test/synonyms/90_synonyms_reloading_for_synset.yml          | 1 -
 10 files changed, 12 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index 7fdfb9c79911b..c3a1bc7adf1ec 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -20,7 +20,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   - do:
@@ -71,7 +70,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index 0d8d415f2d922..ba23131cf7008 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -30,7 +30,6 @@ teardown:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 43d49a0b48c83..c0de19cf81f6b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -27,7 +27,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 587f6bf5b5672..6efd26e5c7d76 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -25,7 +25,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 5c773a8c3c69d..3be559ea3e373 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -23,7 +23,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   - do:
@@ -53,7 +52,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 30s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index d56f83e0e01b3..657d59e306533 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -27,7 +27,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index ad509a6489da8..b92b2caedfb91 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -27,7 +27,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index 5d6c5e1ed4731..ddbb8a4f4a881 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -25,7 +25,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index cc15202ca5173..ae142de36b3fe 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -24,7 +24,6 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   # Create an index with synonym_filter that uses that synonyms set
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 b4a8446e2fedc..817be6a808222 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
@@ -36,7 +36,6 @@
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: yellow
         wait_for_no_initializing_shards: true
 
   # Create my_index1 with synonym_filter that uses synonyms_set1

From f546dcf5b734c1996de0a5532f2b4ac7b52fd829 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 22 Oct 2024 11:59:37 +0200
Subject: [PATCH 27/30] Simplify waiting condition

---
 .../rest-api-spec/test/synonyms/10_synonyms_put.yml         | 6 ------
 .../rest-api-spec/test/synonyms/110_synonyms_invalid.yml    | 3 ---
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml         | 3 ---
 .../rest-api-spec/test/synonyms/30_synonyms_delete.yml      | 3 ---
 .../rest-api-spec/test/synonyms/40_synonyms_sets_get.yml    | 5 -----
 .../rest-api-spec/test/synonyms/50_synonym_rule_put.yml     | 3 ---
 .../rest-api-spec/test/synonyms/60_synonym_rule_get.yml     | 3 ---
 .../rest-api-spec/test/synonyms/70_synonym_rule_delete.yml  | 3 ---
 .../rest-api-spec/test/synonyms/80_synonyms_from_index.yml  | 3 ---
 .../test/synonyms/90_synonyms_reloading_for_synset.yml      | 3 ---
 10 files changed, 35 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
index c3a1bc7adf1ec..675b98133ce11 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -17,9 +17,6 @@ setup:
 
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   - do:
@@ -67,9 +64,6 @@ setup:
 
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index ba23131cf7008..b3ee8d1d58766 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -27,9 +27,6 @@ teardown:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index c0de19cf81f6b..564ce0796c825 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -24,9 +24,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index 6efd26e5c7d76..d6f3b4a55f20b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -22,9 +22,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 3be559ea3e373..05e6465a729fb 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -20,9 +20,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   - do:
@@ -49,8 +46,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
         timeout: 30s
         wait_for_no_initializing_shards: true
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 657d59e306533..a35c1d22cbb37 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -24,9 +24,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 ---
 teardown:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index b92b2caedfb91..0e42f1098209b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -24,9 +24,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index ddbb8a4f4a881..b1b97b15c316b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -22,9 +22,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
 ---
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index ae142de36b3fe..368f523625029 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -21,9 +21,6 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   # Create an index with synonym_filter that uses that synonyms set
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 817be6a808222..cb5264d278ede 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
@@ -33,9 +33,6 @@
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 60s
         wait_for_no_initializing_shards: true
 
   # Create my_index1 with synonym_filter that uses synonyms_set1

From 9c6210b5939cf7d7dd13ac4bc39af12bce220148 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 22 Oct 2024 12:32:19 +0200
Subject: [PATCH 28/30] Remove debug code

---
 .../test/synonyms/110_synonyms_invalid.yml           | 12 ------------
 .../rest-api-spec/test/synonyms/20_synonyms_get.yml  | 12 ------------
 .../test/synonyms/30_synonyms_delete.yml             | 12 ------------
 .../test/synonyms/40_synonyms_sets_get.yml           | 12 ------------
 .../test/synonyms/50_synonym_rule_put.yml            | 12 ------------
 .../test/synonyms/60_synonym_rule_get.yml            | 12 ------------
 .../test/synonyms/70_synonym_rule_delete.yml         | 12 ------------
 .../test/synonyms/80_synonyms_from_index.yml         | 12 ------------
 .../synonyms/90_synonyms_reloading_for_synset.yml    | 12 ------------
 9 files changed, 108 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index b3ee8d1d58766..bbe57c6b10d5b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -3,18 +3,6 @@ setup:
       cluster_features: ["gte_v8.16.0"]
       reason: Lenient handling of updateable synonyms by default is introduced in 8.16.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
----
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
 ---
 "Load index with an invalid synonym rule":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 564ce0796c825..765af46f18653 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -3,11 +3,6 @@ setup:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
 
   - do:
       synonyms.put_synonym:
@@ -43,13 +38,6 @@ setup:
         - synonyms: "test => check"
           id: "test-id-3"
 ---
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
----
 "Get synonyms set - not found":
   - do:
       catch: missing
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index d6f3b4a55f20b..c81401462486a 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -3,11 +3,6 @@ setup:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
 
   - do:
       synonyms.put_synonym:
@@ -24,13 +19,6 @@ setup:
       cluster.health:
         wait_for_no_initializing_shards: true
 ---
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
----
 "Delete synonyms set":
   - do:
       synonyms.delete_synonym:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 05e6465a729fb..940ac20142737 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -3,11 +3,6 @@ setup:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
 
   - do:
       synonyms.put_synonym:
@@ -50,13 +45,6 @@ setup:
         wait_for_no_initializing_shards: true
 
 ---
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
----
 "List synonyms set":
   - do:
       synonyms.get_synonyms_sets: { }
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index a35c1d22cbb37..05bc0fb7b7948 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -3,11 +3,6 @@ setup:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
 
   - do:
       synonyms.put_synonym:
@@ -26,13 +21,6 @@ setup:
       cluster.health:
         wait_for_no_initializing_shards: true
 ---
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
----
 "Update a synonyms rule":
   - do:
       synonyms.put_synonym_rule:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 0e42f1098209b..5acf42fbb92ed 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -3,11 +3,6 @@ setup:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
 
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
 
   - do:
       synonyms.put_synonym:
@@ -26,13 +21,6 @@ setup:
       cluster.health:
         wait_for_no_initializing_shards: true
 
----
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
 
 ---
 "Get a synonym rule":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
index b1b97b15c316b..41ab293158a35 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -2,11 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
   - do:
       synonyms.put_synonym:
         id: test-synonyms
@@ -53,13 +48,6 @@ setup:
           id: "test-id-1"
         - synonyms: "test => check"
           id: "test-id-3"
----
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
 
 ---
 "Delete synonym rule - missing synonym set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
index 368f523625029..3aba0f0b4b78b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -2,11 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Loading synonyms from index is introduced in 8.10.0
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
   # Create a new synonyms set
   - do:
       synonyms.put_synonym:
@@ -57,13 +52,6 @@ setup:
           - '{"index": {"_index": "my_index", "_id": "2"}}'
           - '{"my_field": "goodbye"}'
 ---
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO
----
 "Load synonyms from index for an analyzer":
 
   # Confirm that synonyms from the synonyms set are used
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 cb5264d278ede..1ceb5b43b8129 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
@@ -3,11 +3,6 @@
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Reloading analyzers for specific synonym set is introduced in 8.10.0
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: DEBUG
   # Create synonyms_set1
   - do:
       synonyms.put_synonym:
@@ -141,10 +136,3 @@
               my_field:
                 query: salute
   - match: { hits.total.value: 0 }
----
-teardown:
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch: INFO

From 3cb8beb35a1cf33551d007fe0a3b434e8e7d8b05 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 22 Oct 2024 12:44:51 +0200
Subject: [PATCH 29/30] Revert changes to run configs

---
 .idea/runConfigurations/Debug_Elasticsearch__node_2_.xml | 2 +-
 .idea/runConfigurations/Debug_Elasticsearch__node_3_.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
index e3328d2324613..94bb079398ffd 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_2_.xml
@@ -8,4 +8,4 @@
     <option name="AUTO_RESTART" value="true" />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
index b6432bb83e937..aaef20fec729b 100644
--- a/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
+++ b/.idea/runConfigurations/Debug_Elasticsearch__node_3_.xml
@@ -8,4 +8,4 @@
     <option name="AUTO_RESTART" value="true" />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file

From 1afb3ca5217bfb7ddb8c5a15fbd67df4c6d9762d Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Tue, 22 Oct 2024 12:54:11 +0200
Subject: [PATCH 30/30] Revert previous changes

---
 .../test/synonyms/110_synonyms_invalid.yml         |  1 -
 .../test/synonyms/20_synonyms_get.yml              |  2 --
 .../test/synonyms/30_synonyms_delete.yml           |  2 --
 .../test/synonyms/40_synonyms_sets_get.yml         | 14 --------------
 .../test/synonyms/50_synonym_rule_put.yml          |  2 --
 .../test/synonyms/60_synonym_rule_get.yml          |  2 --
 .../synonyms/SynonymsManagementAPIService.java     |  2 +-
 .../test/rest/yaml/ClientYamlTestClient.java       |  1 -
 8 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
index bbe57c6b10d5b..4e77e10495109 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -2,7 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.16.0"]
       reason: Lenient handling of updateable synonyms by default is introduced in 8.16.0
-
 ---
 "Load index with an invalid synonym rule":
   - do:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
index 765af46f18653..5e6d4ec2341ad 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -2,8 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-
-
   - do:
       synonyms.put_synonym:
         id: test-get-synonyms
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
index c81401462486a..23c907f6a1137 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -2,8 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-
-
   - do:
       synonyms.put_synonym:
         id: test-get-synonyms
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
index 940ac20142737..7c145dafd81cd 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -2,8 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-
-
   - do:
       synonyms.put_synonym:
         id: test-synonyms-3
@@ -31,18 +29,6 @@ setup:
         body:
           synonyms_set:
             - synonyms: "pc, computer"
-  # set logging to debug for issue: https://github.com/elastic/elasticsearch/issues/102261
-  - do:
-      cluster.put_settings:
-        body:
-          persistent:
-            logger.org.elasticsearch.synonyms: DEBUG
-
-  # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
-  - do:
-      cluster.health:
-        timeout: 30s
-        wait_for_no_initializing_shards: true
 
 ---
 "List synonyms set":
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
index 05bc0fb7b7948..d8611000fe465 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -2,8 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-
-
   - do:
       synonyms.put_synonym:
         id: test-synonyms
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
index 5acf42fbb92ed..0c962b51e08cb 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -2,8 +2,6 @@ setup:
   - requires:
       cluster_features: ["gte_v8.10.0"]
       reason: Introduced in 8.10.0
-
-
   - do:
       synonyms.put_synonym:
         id: test-synonyms
diff --git a/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java b/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
index 06ca990b7193d..c760e8043e262 100644
--- a/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
+++ b/server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java
@@ -566,7 +566,7 @@ private static String internalSynonymRuleId(String synonymsSetId, String synonym
     static Settings settings() {
         return Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
-            .put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1")
+            .put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-all")
             .put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), SYNONYMS_INDEX_FORMAT)
             .build();
     }
diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
index ddcbae1e42512..47f0df776b4cd 100644
--- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
+++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java
@@ -195,7 +195,6 @@ public ClientYamlTestResponse callApi(
             Response response = getRestClient(nodeSelector).performRequest(request);
             return new ClientYamlTestResponse(response);
         } catch (ResponseException e) {
-            logger.error("error calling api [{}], nodeSelector {}", apiName, nodeSelector);
             throw new ClientYamlTestResponseException(e);
         }
     }