From c38544d1e7e7fbc374165bb3ca213c811e4a18c0 Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Fri, 3 Mar 2023 14:33:50 +0100 Subject: [PATCH 1/3] use 1 replica in YAML tests that issue get/exist --- .../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 5731da79a04fd..680becf9b3a73 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: 0 + number_of_replicas: 1 - 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 e23a71ae42301..ae0207c50b362 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: 0 + number_of_replicas: 1 - 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 3e60cbbf4968f..d01bb6bf01f95 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: 0 + number_of_replicas: 1 - 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 cd83a7868528c..07115aba42069 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: 0 + number_of_replicas: 1 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..fcc2f698600a3 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: 0 + number_of_replicas: 1 - 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 3b56471134b93..2363bf764e951 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: 0 + number_of_replicas: 1 - 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 6046ac2abbe37..ac7b79d666ea9 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: 0 + number_of_replicas: 1 - 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 8820a8921ceec..c7bd10fab72ba 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: 0 + number_of_replicas: 1 - 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 3229701365a57..3819099b32f88 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: 0 + number_of_replicas: 1 - 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 a4d1841ed7108..16d671df12d72 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: 0 + index.number_of_replicas: 1 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 403debb08a64a..e0c9b892e4298 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: 0 + number_of_replicas: 1 - do: cluster.health: From 843f2103c7e6657a1a663d47b249b6d668c664b1 Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Fri, 3 Mar 2023 15:17:20 +0100 Subject: [PATCH 2/3] Use 2 nodes in YAML test cluster --- .../java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java | 1 + 1 file changed, 1 insertion(+) 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 2d29cddc9ce1c..bdb7d2350255b 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,6 +30,7 @@ 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) { From a88225556fe749987e59205389fe437db2d2cb0e Mon Sep 17 00:00:00 2001 From: Pooya Salehi Date: Fri, 3 Mar 2023 15:33:46 +0100 Subject: [PATCH 3/3] Use 2 nodes in YAML test cluster for Security --- .../xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java | 1 + 1 file changed, 1 insertion(+) 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 81533552765df..dc7b09c1cc75e 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,6 +42,7 @@ 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) {