Add logging and shard allocation explain

carlosdelest · Oct 18, 2024 · 7f7a4af · 7f7a4af
1 parent a3369ef
commit 7f7a4af
Show file tree

Hide file tree

Showing 10 changed files with 227 additions and 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
@@ -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/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/...-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
@@ -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
@@ -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/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/...-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
@@ -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
@@ -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/...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/...pi-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":