At completion cluster checks without retries

elastic · Nov 12, 2024 · 5c729f1 · 5c729f1
1 parent ed80512
commit 5c729f1
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/elastic/logs/challenges/esql-ccs-snapshot.json b/elastic/logs/challenges/esql-ccs-snapshot.json
@@ -200,15 +200,42 @@
         }
       },
     {% endif %}{# if not p_esql_ccs_skip_remote_clusters ... #}
+
     {% include "tasks/many-clusters-esql-ccs-queries.json" %},
+
+    {# the following cluster health checks purposefully without retries #}
     {
       "name": "check-cluster-health-on-local-cluster-at-completion",
-      "operation": "check-cluster-health-on-local-cluster"
+      "operation": {
+        "operation-type": "cluster-health",
+        "index": "_all",
+        "request-params": {
+          "wait_for_status": "{{cluster_health | default('green')}}",
+          {% if p_esql_ccs_local_nodes_count > 0 %}
+          "wait_for_nodes": {{ p_esql_ccs_local_nodes_count }},
+          {% endif %}
+          "wait_for_no_relocating_shards": "true"
+        },
+        "retry-until-success": false
+      }
     }
     {% if not p_esql_ccs_skip_remote_clusters %},
       {
         "name": "check-cluster-health-on-remote-clusters-at-completion",
-        "operation": "check-cluster-health-on-remote-clusters"
+        "operation": {
+          "operation-type": "multi-cluster-wrapper",
+          "base-operation-type": "cluster-health",
+          "ignore-clusters": ["default"],
+          "index": "_all",
+          "request-params": {
+            "wait_for_status": "{{wait_for_status | default('green')}}",
+            {% if p_esql_ccs_remote_nodes_count > 0 %}
+            "wait_for_nodes": {{ p_esql_ccs_remote_nodes_count }},
+            {% endif %}
+            "wait_for_no_relocating_shards": "true"
+          },
+          "retry-until-success": false
+        }
       }
     {% endif %}
   ]