Add timeout to synonyms put APIs to wait for synonyms system index to be searchable

docs/changelog/126314.yaml

@@ -0,0 +1,6 @@
+pr: 126314
+summary: Add timeout to synonyms put APIs to wait for synonyms to be accessible
+area: Analysis
+type: bug
+issues:
+ - 121441

rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym.json

@@ -30,6 +30,12 @@
  }
  ]
  },
+ "params": {
+ "timeout": {
+ "type": "time",
+ "description": "Explicit timeout for the operation to complete"
+ }
+ },
  "body": {
  "description": "Synonyms set rules",
  "required": true

rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym_rule.json

@@ -34,6 +34,12 @@
  }
  ]
  },
+ "params": {
+ "timeout": {
+ "type": "time",
+ "description": "Explicit timeout for the operation to complete"
+ }
+ },
  "body": {
  "description": "Synonym rule",
  "required": true

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

@@ -15,11 +15,6 @@ setup:
 
  - match: { result: "created" }
 
- - do:
- cluster.health:
- index: .synonyms
- wait_for_status: green
-
  - do:
  synonyms.get_synonym:
  id: test-update-synonyms
@@ -63,18 +58,29 @@ setup:
 
  - match: { result: "created" }
 
- - do:
- cluster.health:
- index: .synonyms
- wait_for_status: green
-
  - do:
  synonyms.get_synonym:
  id: test-empty-synonyms
 
  - match: { count: 0 }
  - match: { synonyms_set: [] }
 
+---
+"Timeout can be specified":
+ - do:
+ synonyms.put_synonym:
+ id: test-update-synonyms
+ timeout: 10s
+ body:
+ synonyms_set:
+ - synonyms: "hello, hi"
+ - synonyms: "bye => goodbye"
+ id: "test-id"
+
+ - match: { result: "created" }
+ - match: { reload_analyzers_details._shards.total: 0 }
+ - length: { reload_analyzers_details.reload_details: 0 }
+
 ---
 "Validation fails tests":
  - do:
@@ -116,3 +122,13 @@ setup:
  body:
  synonyms_set:
  - synonyms: "bye, goodbye, "
+
+ - do:
+ catch: /as a time value:\ negative durations are not supported/
+ synonyms.put_synonym:
+ id: test-update-synonyms
+ timeout: -100s
+ body:
+ synonyms_set:
+ - synonyms: "bye, goodbye"
+

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

@@ -11,12 +11,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
  - do:
  indices.create:
  index: test_index
@@ -372,13 +366,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
-
  - do:
  indices.stats: { index: test_index }
 
@@ -441,12 +428,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
  - do:
  # Warning issued in previous versions
  allowed_warnings:

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

@@ -14,12 +14,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
 ---
 "Get synonyms set":
  - do:

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

@@ -12,12 +12,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
 ---
 "Delete synonyms set":
  - do:
@@ -77,7 +71,6 @@ setup:
  settings:
  index:
  number_of_shards: 1
- number_of_replicas: 0
  analysis:
  filter:
  my_synonym_filter:

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

@@ -10,12 +10,6 @@ setup:
  - 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:
- index: .synonyms
- wait_for_status: green
-
  - do:
  synonyms.put_synonym:
  id: test-synonyms-1

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

@@ -14,12 +14,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
 ---
 "Update a synonyms rule":
  - do:
@@ -85,3 +79,69 @@ setup:
  rule_id: "test-id-0"
  body:
  synonyms: "i-phone, iphone"
+
+---
+"Timeout can be specified":
+ - do:
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ timeout: 10s
+ body:
+ synonyms: "i-phone, iphone"
+
+ - match: { result: "created" }
+ - match: { reload_analyzers_details._shards.total: 0 }
+ - length: { reload_analyzers_details.reload_details: 0 }
+
+---
+"Validation failure tests":
+ - do:
+ catch: /\[synonyms\] field can't be empty/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ body:
+ synonyms: ""
+
+ - do:
+ catch: /More than one explicit mapping specified in the same synonyms rule/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ body:
+ synonyms: "bye => => goodbye"
+
+ - do:
+ catch: /Incorrect syntax for \[synonyms\]/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ body:
+ synonyms: " => goodbye"
+
+ - do:
+ catch: /Incorrect syntax for \[synonyms\]/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ body:
+ synonyms: "bye => "
+
+ - do:
+ catch: /Incorrect syntax for \[synonyms\]/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ body:
+ synonyms: "bye, goodbye, "
+
+ - do:
+ catch: /as a time value:\ negative durations are not supported/
+ synonyms.put_synonym_rule:
+ set_id: "test-synonyms"
+ rule_id: "test-id-0"
+ timeout: -100s
+ body:
+ synonyms_set:
+ - synonyms: "bye, goodbye"

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

@@ -14,12 +14,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
 ---
 "Get a synonym rule":
  - do:

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

@@ -14,12 +14,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
 ---
 "Delete synonym rule":
  - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml

@@ -13,12 +13,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
  # Create an index with synonym_filter that uses that synonyms set
  - do:
  indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml

@@ -14,12 +14,6 @@ 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:
- index: .synonyms
- wait_for_status: green
-
  # Create synonyms synonyms_set2
  - do:
  synonyms.put_synonym: