Add timeout to put synonyms action, fix tests

Author: carlosdelest

server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.synonyms;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionType;
@@ -31,6 +32,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import static org.elasticsearch.action.synonyms.PutSynonymRuleAction.DEFAULT_TIMEOUT;
+
 public class PutSynonymsAction extends ActionType<SynonymUpdateResponse> {
 
     public static final PutSynonymsAction INSTANCE = new PutSynonymsAction();
@@ -43,6 +46,7 @@ public PutSynonymsAction() {
     public static class Request extends ActionRequest {
         private final String synonymsSetId;
         private final SynonymRule[] synonymRules;
+        private final int timeout;
 
         public static final ParseField SYNONYMS_SET_FIELD = new ParseField(SynonymsManagementAPIService.SYNONYMS_SET_FIELD);
         private static final ConstructingObjectParser<SynonymRule[], Void> PARSER = new ConstructingObjectParser<>("synonyms_set", args -> {
@@ -59,20 +63,27 @@ public Request(StreamInput in) throws IOException {
             super(in);
             this.synonymsSetId = in.readString();
             this.synonymRules = in.readArray(SynonymRule::new, SynonymRule[]::new);
+            if (in.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_UPDATE_TIMEOUT)) {
+                this.timeout = in.readInt();
+            } else {
+                this.timeout = DEFAULT_TIMEOUT;
+            }
         }
 
-        public Request(String synonymsSetId, BytesReference content, XContentType contentType) throws IOException {
+        public Request(String synonymsSetId, int timeout, BytesReference content, XContentType contentType) throws IOException {
             this.synonymsSetId = synonymsSetId;
+            this.timeout = timeout;
             try (XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, content, contentType)) {
                 this.synonymRules = PARSER.apply(parser, null);
             } catch (Exception e) {
                 throw new IllegalArgumentException("Failed to parse: " + content.utf8ToString(), e);
             }
         }
 
-        Request(String synonymsSetId, SynonymRule[] synonymRules) {
+        Request(String synonymsSetId, SynonymRule[] synonymRules, int timeout) {
             this.synonymsSetId = synonymsSetId;
             this.synonymRules = synonymRules;
+            this.timeout = timeout;
         }
 
         @Override
@@ -95,12 +106,19 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(synonymsSetId);
             out.writeArray(synonymRules);
+            if (out.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_UPDATE_TIMEOUT)) {
+                out.writeInt(timeout);
+            }
         }
 
         public String synonymsSetId() {
             return synonymsSetId;
         }
 
+        public int timeout() {
+            return timeout;
+        }
+
         public SynonymRule[] synonymRules() {
             return synonymRules;
         }
@@ -110,12 +128,14 @@ public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             Request request = (Request) o;
-            return Objects.equals(synonymsSetId, request.synonymsSetId) && Arrays.equals(synonymRules, request.synonymRules);
+            return timeout == request.timeout
+                && Objects.equals(synonymsSetId, request.synonymsSetId)
+                && Arrays.equals(synonymRules, request.synonymRules);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(synonymsSetId, Arrays.hashCode(synonymRules));
+            return Objects.hash(synonymsSetId, Arrays.hashCode(synonymRules), timeout);
         }
     }
 }

server/src/main/java/org/elasticsearch/action/synonyms/TransportDeleteSynonymRuleAction.java

@@ -41,7 +41,7 @@ protected void doExecute(Task task, DeleteSynonymRuleAction.Request request, Act
         synonymsManagementAPIService.deleteSynonymRule(
             request.synonymsSetId(),
             request.synonymRuleId(),
-            listener.map(SynonymUpdateResponse::new),
-                timeout);
+            listener.map(SynonymUpdateResponse::new)
+        );
     }
 }

server/src/main/java/org/elasticsearch/action/synonyms/TransportDeleteSynonymsAction.java

@@ -39,6 +39,6 @@ public TransportDeleteSynonymsAction(TransportService transportService, ActionFi
 
     @Override
     protected void doExecute(Task task, DeleteSynonymsAction.Request request, ActionListener<AcknowledgedResponse> listener) {
-        synonymsManagementAPIService.deleteSynonymsSet(request.synonymsSetId(), listener, timeout);
+        synonymsManagementAPIService.deleteSynonymsSet(request.synonymsSetId(), listener);
     }
 }

server/src/main/java/org/elasticsearch/action/synonyms/TransportPutSynonymsAction.java

@@ -35,6 +35,7 @@ protected void doExecute(Task task, PutSynonymsAction.Request request, ActionLis
         synonymsManagementAPIService.putSynonymsSet(
             request.synonymsSetId(),
             request.synonymRules(),
+            request.timeout(),
             listener.map(SynonymUpdateResponse::new)
         );
     }

server/src/main/java/org/elasticsearch/rest/action/synonyms/RestPutSynonymsAction.java

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.action.synonyms.PutSynonymRuleAction.DEFAULT_TIMEOUT;
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
 
 @ServerlessScope(Scope.PUBLIC)
@@ -40,6 +41,7 @@ public List<Route> routes() {
     protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
         PutSynonymsAction.Request request = new PutSynonymsAction.Request(
             restRequest.param("synonymsSet"),
+            restRequest.paramAsInt("timeout", DEFAULT_TIMEOUT),
             restRequest.content(),
             restRequest.getXContentType()
         );

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

@@ -434,7 +434,7 @@ public void getSynonymRule(String synonymSetId, String synonymRuleId, ActionList
         );
     }
 
-    public void deleteSynonymRule(String synonymsSetId, String synonymRuleId, ActionListener<SynonymsReloadResult> listener, int timeout) {
+    public void deleteSynonymRule(String synonymsSetId, String synonymRuleId, ActionListener<SynonymsReloadResult> listener) {
         client.prepareDelete(SYNONYMS_ALIAS_NAME, internalSynonymRuleId(synonymsSetId, synonymRuleId))
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
             .execute(new DelegatingIndexNotFoundActionListener<>(synonymsSetId, listener, (l, deleteResponse) -> {
@@ -453,7 +453,7 @@ public void deleteSynonymRule(String synonymsSetId, String synonymRuleId, Action
                     return;
                 }
 
-                ensureSynonymsSearchableAndReloadAnalyzers(synonymsSetId, false, listener, UpdateSynonymsResultStatus.DELETED, timeout);
+                reloadAnalyzers(synonymsSetId, false, listener, UpdateSynonymsResultStatus.DELETED);
             }));
     }
 
@@ -508,10 +508,10 @@ private void deleteSynonymsSetObjects(String synonymSetId, ActionListener<BulkBy
         client.execute(DeleteByQueryAction.INSTANCE, dbqRequest, listener);
     }
 
-    public void deleteSynonymsSet(String synonymSetId, ActionListener<AcknowledgedResponse> listener, int timeout) {
+    public void deleteSynonymsSet(String synonymSetId, ActionListener<AcknowledgedResponse> listener) {
 
         // Previews reloading the resource to understand its usage on indices
-        ensureSynonymsSearchableAndReloadAnalyzers(synonymSetId, true, listener.delegateFailure((reloadListener, reloadResult) -> {
+        reloadAnalyzers(synonymSetId, true, listener.delegateFailure((reloadListener, reloadResult) -> {
             Map<String, ReloadAnalyzersResponse.ReloadDetails> reloadDetails = reloadResult.reloadAnalyzersResponse.getReloadDetails();
             if (reloadDetails.isEmpty() == false) {
                 Set<String> indices = reloadDetails.entrySet()
@@ -548,7 +548,7 @@ public void deleteSynonymsSet(String synonymSetId, ActionListener<AcknowledgedRe
 
                 deleteObjectsListener.onResponse(AcknowledgedResponse.of(true));
             }));
-        }), null, timeout);
+        }), null);
     }
 
     private <T> void ensureSynonymsSearchableAndReloadAnalyzers(

server/src/test/java/org/elasticsearch/action/synonyms/PutSynonymRuleActionRequestSerializingTests.java

@@ -22,7 +22,7 @@ protected Writeable.Reader<PutSynonymRuleAction.Request> instanceReader() {
 
     @Override
     protected PutSynonymRuleAction.Request createTestInstance() {
-        return new PutSynonymRuleAction.Request(randomIdentifier(), SynonymsTestUtils.randomSynonymRule());
+        return new PutSynonymRuleAction.Request(randomIdentifier(), SynonymsTestUtils.randomSynonymRule(), randomNonNegativeInt());
     }
 
     @Override

server/src/test/java/org/elasticsearch/action/synonyms/PutSynonymsActionRequestSerializingTests.java

@@ -25,7 +25,7 @@ protected Writeable.Reader<PutSynonymsAction.Request> instanceReader() {
 
     @Override
     protected PutSynonymsAction.Request createTestInstance() {
-        return new PutSynonymsAction.Request(randomIdentifier(), randomSynonymsSet());
+        return new PutSynonymsAction.Request(randomIdentifier(), randomSynonymsSet(), randomNonNegativeInt());
     }
 
     @Override