Skip to content

Commit 7f7a4af

Browse files
committed
Add logging and shard allocation explain
1 parent a3369ef commit 7f7a4af

File tree

10 files changed

+227
-40
lines changed

10 files changed

+227
-40
lines changed

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ setup:
1515

1616
- match: { result: "created" }
1717

18-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
19-
- do:
20-
cluster.health:
21-
index: .synonyms-2
22-
level: shards
23-
wait_for_status: green
24-
timeout: 2m
25-
26-
- do:
27-
synonyms.get_synonym:
28-
id: test-update-synonyms
29-
3018
- is_true: synonyms_set.0.id
3119
- is_true: synonyms_set.1.id
3220

@@ -71,7 +59,7 @@ setup:
7159
index: .synonyms-2
7260
level: shards
7361
wait_for_status: green
74-
timeout: 2m
62+
timeout: 30s
7563

7664
- do:
7765
synonyms.get_synonym:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.16.0"]
44
reason: Lenient handling of updateable synonyms by default is introduced in 8.16.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
---
12+
teardown:
13+
- do:
14+
cluster.put_settings:
15+
body:
16+
persistent:
17+
logger.org.elasticsearch: INFO
518
---
619
"Load index with an invalid synonym rule":
720
- do:
@@ -11,13 +24,26 @@ setup:
1124
synonyms_set:
1225
synonyms: "foo => bar, baz"
1326

14-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
27+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
28+
- do:
29+
cluster.health:
30+
index: .synonyms-2
31+
level: shards
32+
timeout: 60s
33+
wait_for_status: green
34+
ignore: 408
35+
36+
- do:
37+
cluster.allocation_explain:
38+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
39+
ignore: 400
40+
1541
- do:
1642
cluster.health:
1743
index: .synonyms-2
1844
level: shards
45+
timeout: 20s
1946
wait_for_status: green
20-
timeout: 2m
2147

2248
- do:
2349
indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
512
- do:
613
synonyms.put_synonym:
714
id: test-get-synonyms
@@ -14,13 +21,26 @@ setup:
1421
- synonyms: "test => check"
1522
id: "test-id-3"
1623

17-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
24+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
25+
- do:
26+
cluster.health:
27+
index: .synonyms-2
28+
level: shards
29+
timeout: 60s
30+
wait_for_status: green
31+
ignore: 408
32+
33+
- do:
34+
cluster.allocation_explain:
35+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
36+
ignore: 400
37+
1838
- do:
1939
cluster.health:
2040
index: .synonyms-2
2141
level: shards
42+
timeout: 20s
2243
wait_for_status: green
23-
timeout: 2m
2444

2545
---
2646
"Get synonyms set":
@@ -38,7 +58,13 @@ setup:
3858
id: "test-id-2"
3959
- synonyms: "test => check"
4060
id: "test-id-3"
41-
61+
---
62+
teardown:
63+
- do:
64+
cluster.put_settings:
65+
body:
66+
persistent:
67+
logger.org.elasticsearch: INFO
4268
---
4369
"Get synonyms set - not found":
4470
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
512
- do:
613
synonyms.put_synonym:
714
id: test-get-synonyms
@@ -12,14 +19,33 @@ setup:
1219
- synonyms: "bye => goodbye"
1320
id: "test-id-2"
1421

15-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
22+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1623
- do:
1724
cluster.health:
1825
index: .synonyms-2
1926
level: shards
27+
timeout: 60s
2028
wait_for_status: green
21-
timeout: 2m
29+
ignore: 408
2230

31+
- do:
32+
cluster.allocation_explain:
33+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
34+
ignore: 400
35+
36+
- do:
37+
cluster.health:
38+
index: .synonyms-2
39+
level: shards
40+
timeout: 20s
41+
wait_for_status: green
42+
---
43+
teardown:
44+
- do:
45+
cluster.put_settings:
46+
body:
47+
persistent:
48+
logger.org.elasticsearch: INFO
2349
---
2450
"Delete synonyms set":
2551
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
512
- do:
613
synonyms.put_synonym:
714
id: test-synonyms-3
@@ -10,13 +17,26 @@ setup:
1017
- synonyms: "hello, hi"
1118
- synonyms: "goodbye, bye"
1219

13-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
20+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
21+
- do:
22+
cluster.health:
23+
index: .synonyms-2
24+
level: shards
25+
timeout: 60s
26+
wait_for_status: green
27+
ignore: 408
28+
29+
- do:
30+
cluster.allocation_explain:
31+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
32+
ignore: 400
33+
1434
- do:
1535
cluster.health:
1636
index: .synonyms-2
1737
level: shards
38+
timeout: 20s
1839
wait_for_status: green
19-
timeout: 2m
2040

2141
- do:
2242
synonyms.put_synonym:
@@ -44,7 +64,7 @@ setup:
4464
cluster.health:
4565
index: .synonyms-2
4666
level: shards
47-
timeout: 2m
67+
timeout: 30s
4868
wait_for_status: green
4969

5070

@@ -54,7 +74,7 @@ teardown:
5474
cluster.put_settings:
5575
body:
5676
persistent:
57-
logger.org.elasticsearch.synonyms: null
77+
logger.org.elasticsearch: INFO
5878
---
5979
"List synonyms set":
6080
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
512
- do:
613
synonyms.put_synonym:
714
id: test-synonyms
@@ -14,14 +21,33 @@ setup:
1421
- synonyms: "test => check"
1522
id: "test-id-3"
1623

17-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
24+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1825
- do:
1926
cluster.health:
2027
index: .synonyms-2
2128
level: shards
29+
timeout: 60s
2230
wait_for_status: green
23-
timeout: 2m
31+
ignore: 408
2432

33+
- do:
34+
cluster.allocation_explain:
35+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
36+
ignore: 400
37+
38+
- do:
39+
cluster.health:
40+
index: .synonyms-2
41+
level: shards
42+
timeout: 20s
43+
wait_for_status: green
44+
---
45+
teardown:
46+
- do:
47+
cluster.put_settings:
48+
body:
49+
persistent:
50+
logger.org.elasticsearch: INFO
2551
---
2652
"Update a synonyms rule":
2753
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
6+
- do:
7+
cluster.put_settings:
8+
body:
9+
persistent:
10+
logger.org.elasticsearch: DEBUG
11+
512
- do:
613
synonyms.put_synonym:
714
id: test-synonyms
@@ -14,12 +21,6 @@ setup:
1421
- synonyms: "test => check"
1522
id: "test-id-3"
1623

17-
- do:
18-
cluster.put_settings:
19-
body:
20-
persistent:
21-
logger.org.elasticsearch: DEBUG
22-
2324
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
2425
- do:
2526
cluster.health:
@@ -32,6 +33,7 @@ setup:
3233
- do:
3334
cluster.allocation_explain:
3435
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
36+
ignore: 400
3537

3638
- do:
3739
cluster.health:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5+
- do:
6+
cluster.put_settings:
7+
body:
8+
persistent:
9+
logger.org.elasticsearch: DEBUG
510
- do:
611
synonyms.put_synonym:
712
id: test-synonyms
@@ -14,13 +19,26 @@ setup:
1419
- synonyms: "test => check"
1520
id: "test-id-3"
1621

17-
# This is to ensure that at least two index shards (write and read) are available. In serverless this can take some time.
22+
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1823
- do:
1924
cluster.health:
2025
index: .synonyms-2
2126
level: shards
27+
timeout: 60s
28+
wait_for_status: green
29+
ignore: 408
30+
31+
- do:
32+
cluster.allocation_explain:
33+
body: { "index": ".synonyms-2", "shard": 0, "primary": false }
34+
ignore: 400
35+
36+
- do:
37+
cluster.health:
38+
index: .synonyms-2
39+
level: shards
40+
timeout: 20s
2241
wait_for_status: green
23-
timeout: 2m
2442

2543

2644
---
@@ -52,6 +70,13 @@ setup:
5270
id: "test-id-1"
5371
- synonyms: "test => check"
5472
id: "test-id-3"
73+
---
74+
teardown:
75+
- do:
76+
cluster.put_settings:
77+
body:
78+
persistent:
79+
logger.org.elasticsearch: INFO
5580

5681
---
5782
"Delete synonym rule - missing synonym set":

0 commit comments

Comments
 (0)