Skip to content

Commit 1afb3ca

Browse files
committed
Revert previous changes
1 parent 3cb8beb commit 1afb3ca

File tree

8 files changed

+1
-25
lines changed

8 files changed

+1
-25
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ 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-
65
---
76
"Load index with an invalid synonym rule":
87
- do:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5-
6-
75
- do:
86
synonyms.put_synonym:
97
id: test-get-synonyms

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5-
6-
75
- do:
86
synonyms.put_synonym:
97
id: test-get-synonyms

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5-
6-
75
- do:
86
synonyms.put_synonym:
97
id: test-synonyms-3
@@ -31,18 +29,6 @@ setup:
3129
body:
3230
synonyms_set:
3331
- synonyms: "pc, computer"
34-
# set logging to debug for issue: https://github.com/elastic/elasticsearch/issues/102261
35-
- do:
36-
cluster.put_settings:
37-
body:
38-
persistent:
39-
logger.org.elasticsearch.synonyms: DEBUG
40-
41-
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
42-
- do:
43-
cluster.health:
44-
timeout: 30s
45-
wait_for_no_initializing_shards: true
4632

4733
---
4834
"List synonyms set":

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5-
6-
75
- do:
86
synonyms.put_synonym:
97
id: test-synonyms

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ setup:
22
- requires:
33
cluster_features: ["gte_v8.10.0"]
44
reason: Introduced in 8.10.0
5-
6-
75
- do:
86
synonyms.put_synonym:
97
id: test-synonyms

server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ private static String internalSynonymRuleId(String synonymsSetId, String synonym
566566
static Settings settings() {
567567
return Settings.builder()
568568
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
569-
.put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1")
569+
.put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-all")
570570
.put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), SYNONYMS_INDEX_FORMAT)
571571
.build();
572572
}

test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ public ClientYamlTestResponse callApi(
195195
Response response = getRestClient(nodeSelector).performRequest(request);
196196
return new ClientYamlTestResponse(response);
197197
} catch (ResponseException e) {
198-
logger.error("error calling api [{}], nodeSelector {}", apiName, nodeSelector);
199198
throw new ClientYamlTestResponseException(e);
200199
}
201200
}

0 commit comments

Comments
 (0)