From 5be9a61e6d8b5fb7d6bd8d9d543823b6b8f59171 Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Tue, 7 Mar 2023 17:11:28 +0100 Subject: [PATCH 1/3] Revert "Use 1 replica in YAML tests that issue get/exist calls (#94303)" This reverts commit 97c2812e58982e47131403bdce90ee9ef6bf1d7e. --- .../resources/rest-api-spec/test/create/40_routing.yml | 2 +- .../resources/rest-api-spec/test/exists/40_routing.yml | 2 +- .../resources/rest-api-spec/test/exists/60_realtime_refresh.yml | 2 +- .../resources/rest-api-spec/test/get/100_synthetic_source.yml | 2 +- .../resources/rest-api-spec/test/get/40_routing.yml | 2 +- .../resources/rest-api-spec/test/get/60_realtime_refresh.yml | 2 +- .../resources/rest-api-spec/test/get_source/40_routing.yml | 2 +- .../rest-api-spec/test/get_source/60_realtime_refresh.yml | 2 +- .../resources/rest-api-spec/test/index/40_routing.yml | 2 +- .../resources/rest-api-spec/test/indices.clone/10_basic.yml | 2 +- .../resources/rest-api-spec/test/update/40_routing.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml index 680becf9b3a73..5731da79a04fd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml @@ -9,7 +9,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml index ae0207c50b362..e23a71ae42301 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml @@ -10,7 +10,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml index d01bb6bf01f95..3e60cbbf4968f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml @@ -9,7 +9,7 @@ settings: index: refresh_interval: -1 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml index 07115aba42069..cd83a7868528c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml @@ -595,7 +595,7 @@ _doc_count: index: test body: settings: - number_of_replicas: 1 + number_of_replicas: 0 mappings: _source: mode: synthetic diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml index fcc2f698600a3..defd738b9c205 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml @@ -11,7 +11,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml index 2363bf764e951..3b56471134b93 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml @@ -10,7 +10,7 @@ settings: index: refresh_interval: -1 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml index ac7b79d666ea9..6046ac2abbe37 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml @@ -12,7 +12,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml index c7bd10fab72ba..8820a8921ceec 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml @@ -9,7 +9,7 @@ body: settings: refresh_interval: -1 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml index 3819099b32f88..3229701365a57 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml @@ -10,7 +10,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml index 16d671df12d72..a4d1841ed7108 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml @@ -53,7 +53,7 @@ setup: master_timeout: 10s body: settings: - index.number_of_replicas: 1 + index.number_of_replicas: 0 index.number_of_shards: 2 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml index e0c9b892e4298..403debb08a64a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml @@ -11,7 +11,7 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 1 + number_of_replicas: 0 - do: cluster.health: From e55e8c68544c4f1054ffe454ecda80a34e9a3210 Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Tue, 7 Mar 2023 17:11:42 +0100 Subject: [PATCH 2/3] Revert "Use 2 nodes in YAML test cluster (#94304)" This reverts commit def4426e0277e33f89256060554efc18a3857694. --- .../java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java | 1 - .../xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java | 1 - 2 files changed, 2 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java index bdb7d2350255b..2d29cddc9ce1c 100644 --- a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java +++ b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java @@ -30,7 +30,6 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { .module("mapper-extras") .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.DLM_ENABLED) - .nodes(2) .build(); public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java index dc7b09c1cc75e..81533552765df 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java @@ -42,7 +42,6 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest .setting("xpack.security.autoconfiguration.enabled", "false") .user(USER, PASS) .feature(FeatureFlag.TIME_SERIES_MODE) - .nodes(2) .build(); public CoreWithSecurityClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { From fa9761b77eb62e6da96c13f4d199199a7ae1224a Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Wed, 8 Mar 2023 11:25:25 +0100 Subject: [PATCH 3/3] remove wait-for-green from tests that issue get/exists --- .../resources/rest-api-spec/test/create/40_routing.yml | 5 ----- .../resources/rest-api-spec/test/exists/40_routing.yml | 5 ----- .../rest-api-spec/test/exists/60_realtime_refresh.yml | 5 ----- .../rest-api-spec/test/get/100_synthetic_source.yml | 2 -- .../resources/rest-api-spec/test/get/40_routing.yml | 5 ----- .../rest-api-spec/test/get/60_realtime_refresh.yml | 5 ----- .../resources/rest-api-spec/test/get_source/40_routing.yml | 5 ----- .../rest-api-spec/test/get_source/60_realtime_refresh.yml | 5 ----- .../resources/rest-api-spec/test/index/40_routing.yml | 5 ----- .../rest-api-spec/test/indices.clone/10_basic.yml | 7 ------- .../resources/rest-api-spec/test/update/40_routing.yml | 5 ----- 11 files changed, 54 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml index 5731da79a04fd..7b17033352277 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml @@ -9,11 +9,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml index e23a71ae42301..be5e547ef2abd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml @@ -10,11 +10,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml index 3e60cbbf4968f..9550ea919f137 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml @@ -9,11 +9,6 @@ settings: index: refresh_interval: -1 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml index cd83a7868528c..2c87da3c3c50c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml @@ -594,8 +594,6 @@ _doc_count: indices.create: index: test body: - settings: - number_of_replicas: 0 mappings: _source: mode: synthetic diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml index defd738b9c205..dd58035657869 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml @@ -11,11 +11,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml index 3b56471134b93..beca2e0abf30d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml @@ -10,11 +10,6 @@ settings: index: refresh_interval: -1 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml index 6046ac2abbe37..1dede56584416 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml @@ -12,11 +12,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml index 8820a8921ceec..73b6d9ab4a8ac 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml @@ -9,11 +9,6 @@ body: settings: refresh_interval: -1 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml index 3229701365a57..c217e9e799254 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml @@ -10,11 +10,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: index: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml index a4d1841ed7108..d5007d29f3715 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml @@ -49,17 +49,10 @@ setup: indices.clone: index: "source" target: "target" - wait_for_active_shards: 1 master_timeout: 10s body: settings: - index.number_of_replicas: 0 index.number_of_shards: 2 - - - do: - cluster.health: - wait_for_status: green - - do: get: index: target diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml index 403debb08a64a..e424c71781fcf 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml @@ -11,11 +11,6 @@ index: number_of_shards: 5 number_of_routing_shards: 5 - number_of_replicas: 0 - - - do: - cluster.health: - wait_for_status: green - do: update: