Skip to content
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.

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

Fix synonyms CI tests timeout #114641

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
438f9ad
Fixes synonyms CI issues for serverless
carlosdelest Oct 11, 2024
7641f2b
Change timeout
carlosdelest Oct 11, 2024
92bf1d0
Change status and wait for active shards
carlosdelest Oct 14, 2024
df817e7
Wait for 2 active shards, remove yellow status
carlosdelest Oct 15, 2024
d4bd80a
Revert run config changes
carlosdelest Oct 15, 2024
53b85b2
Fixes synonyms CI issues for serverless
carlosdelest Oct 11, 2024
1c51d57
Change timeout
carlosdelest Oct 11, 2024
90f37bf
Change status and wait for active shards
carlosdelest Oct 14, 2024
aa76783
Wait for 2 active shards, remove yellow status
carlosdelest Oct 15, 2024
5041b05
Revert run config changes
carlosdelest Oct 15, 2024
ca0e0e8
Fixes synonyms CI issues for serverless
carlosdelest Oct 11, 2024
61b1938
Change timeout
carlosdelest Oct 11, 2024
c3b5a3e
Change auto expand replicas for synonyms index
carlosdelest Oct 16, 2024
ecb05c1
Check index status is green vs active shards
carlosdelest Oct 16, 2024
4a01ec7
Remove unnecessary changes
carlosdelest Oct 16, 2024
bbe4c9b
No need to wait on status for put
carlosdelest Oct 16, 2024
3cb2bc4
Merge branch 'main' into carlosdelest/fix-synonyms-ci-tests-timeout
carlosdelest Oct 17, 2024
87bec86
Increasing timeout as nothing prevents replicas from being allocated,…
carlosdelest Oct 17, 2024
6d5c21b
Trying to get more info out of the errors
carlosdelest Oct 17, 2024
df3ec1f
Fix error message
carlosdelest Oct 17, 2024
d70faa0
Merge branch 'main' into carlosdelest/fix-synonyms-ci-tests-timeout
carlosdelest Oct 17, 2024
a3369ef
Add cluster alloc explain
carlosdelest Oct 17, 2024
7f7a4af
Add logging and shard allocation explain
carlosdelest Oct 18, 2024
71acb0e
Check with wait_for_no_initializing_shards
carlosdelest Oct 21, 2024
7592917
Crossing my t's
carlosdelest Oct 21, 2024
83337d4
Seriously...
carlosdelest Oct 21, 2024
8fff92a
Fix test
carlosdelest Oct 21, 2024
b9b82b8
Remove wait_for_status
carlosdelest Oct 22, 2024
f546dcf
Simplify waiting condition
carlosdelest Oct 22, 2024
71dced7
Merge remote-tracking branch 'origin/carlosdelest/fix-synonyms-ci-tes…
carlosdelest Oct 22, 2024
bc07059
Merge branch 'main' into carlosdelest/fix-synonyms-ci-tests-timeout
carlosdelest Oct 22, 2024
9c6210b
Remove debug code
carlosdelest Oct 22, 2024
3cb8beb
Revert changes to run configs
carlosdelest Oct 22, 2024
1afb3ca
Revert previous changes
carlosdelest Oct 22, 2024
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
9 changes: 0 additions & 9 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,6 @@ tests:
- class: org.elasticsearch.xpack.inference.DefaultElserIT
method: testInferCreatesDefaultElser
issue: https://github.com/elastic/elasticsearch/issues/114503
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Synonym set not found}
issue: https://github.com/elastic/elasticsearch/issues/114432
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Get a synonym rule}
issue: https://github.com/elastic/elasticsearch/issues/114443
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Synonym rule not found}
issue: https://github.com/elastic/elasticsearch/issues/114444
- class: org.elasticsearch.xpack.inference.integration.ModelRegistryIT
method: testGetModel
issue: https://github.com/elastic/elasticsearch/issues/114657
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ setup:

- match: { result: "created" }

- do:
cluster.health:
wait_for_no_initializing_shards: true

- do:
synonyms.get_synonym:
id: test-update-synonyms
Expand Down Expand Up @@ -58,6 +62,10 @@ setup:

- match: { result: "created" }

- do:
cluster.health:
wait_for_no_initializing_shards: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😍

Does this work? Seems likely?


- do:
synonyms.get_synonym:
id: test-empty-synonyms
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ setup:
synonyms_set:
synonyms: "foo => bar, baz"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

- do:
indices.create:
index: test_index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ setup:
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

---
"Get synonyms set":
Expand All @@ -31,7 +35,6 @@ setup:
id: "test-id-2"
- synonyms: "test => check"
id: "test-id-3"

---
"Get synonyms set - not found":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ setup:
- synonyms: "bye => goodbye"
id: "test-id-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true
---
"Delete synonyms set":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ setup:
synonyms_set:
- synonyms: "hello, hi"
- synonyms: "goodbye, bye"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

- do:
synonyms.put_synonym:
id: test-synonyms-1
Expand All @@ -23,21 +29,8 @@ setup:
body:
synonyms_set:
- synonyms: "pc, computer"
# set logging to debug for issue: https://github.com/elastic/elasticsearch/issues/102261
- do:
cluster.put_settings:
body:
persistent:
logger.org.elasticsearch.synonyms: DEBUG

---
teardown:
- do:
cluster.put_settings:
body:
persistent:
logger.org.elasticsearch.synonyms: null
---
"List synonyms set":
- do:
synonyms.get_synonyms_sets: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ setup:
- synonyms: "test => check"
id: "test-id-3"


# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true
---
"Update a synonyms rule":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ setup:
id: "test-id-2"
- synonyms: "test => check"
id: "test-id-3"

# 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
timeout: 1m
wait_for_status: green
wait_for_no_initializing_shards: true


---
"Get a synonym rule":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ setup:
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

---
"Delete synonym rule":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ setup:
- requires:
cluster_features: ["gte_v8.10.0"]
reason: Loading synonyms from index is introduced in 8.10.0

# Create a new synonyms set
- do:
synonyms.put_synonym:
Expand All @@ -14,6 +13,11 @@ setup:
- synonyms: "bye => goodbye"
id: "synonym-rule-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

# Create an index with synonym_filter that uses that synonyms set
- do:
indices.create:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
- requires:
cluster_features: ["gte_v8.10.0"]
reason: Reloading analyzers for specific synonym set is introduced in 8.10.0

# Create synonyms_set1
- do:
synonyms.put_synonym:
Expand All @@ -26,6 +25,11 @@
- synonyms: "bye => goodbye"
id: "synonym-rule-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
wait_for_no_initializing_shards: true

# Create my_index1 with synonym_filter that uses synonyms_set1
- do:
indices.create:
Expand Down