Skip to content

Revert to 1 node cluster for YAML tests and avoid wait for green #94385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 8, 2023
Merged

Revert to 1 node cluster for YAML tests and avoid wait for green #94385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5be9a61
Revert "Use 1 replica in YAML tests that issue get/exist calls (#94303)"
pxsalehi Mar 7, 2023
e55e8c6
Revert "Use 2 nodes in YAML test cluster (#94304)"
pxsalehi Mar 7, 2023
fa9761b
remove wait-for-green from tests that issue get/exists
pxsalehi Mar 8, 2023
cb03cb0
Merge branch 'main' into ps230308-avoidWaitForGreenInYamlTests
elasticmachine Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/create/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
create:
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
settings:
index:
refresh_interval: -1
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
2 changes: 0 additions & 2 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,6 @@ _doc_count:
indices.create:
index: test
body:
settings:
number_of_replicas: 1
mappings:
_source:
mode: synthetic
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/60_realtime_refresh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
settings:
index:
refresh_interval: -1
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions ...api-spec/src/yamlRestTest/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
body:
settings:
refresh_interval: -1
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
index:
Expand Down
7 changes: 0 additions & 7 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1
index.number_of_shards: 2

- do:
cluster.health:
wait_for_status: green

- do:
get:
index: target
Expand Down
5 changes: 0 additions & 5 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/40_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
index:
number_of_shards: 5
number_of_routing_shards: 5
number_of_replicas: 1

- do:
cluster.health:
wait_for_status: green

- do:
update:
Expand Down
1 change: 0 additions & 1 deletion ...RestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down