Use TransportVersion to check for new param, bump TransportVersion

carlosdelest · Jul 13, 2023 · e8234e0 · e8234e0
1 parent 71e8b38
commit e8234e0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/server/src/main/java/org/elasticsearch/TransportVersion.java b/server/src/main/java/org/elasticsearch/TransportVersion.java
@@ -165,9 +165,11 @@ private static TransportVersion registerTransportVersion(int id, String uniqueId
     public static final TransportVersion V_8_500_030 = registerTransportVersion(8_500_030, "b72d7f12-8ed3-4a5b-8e6a-4910ea10e0d7");
     public static final TransportVersion V_8_500_031 = registerTransportVersion(8_500_031, "e7aa7e95-37e7-46a3-aad1-90a21c0769e7");
     public static final TransportVersion V_8_500_032 = registerTransportVersion(8_500_032, "a9a14bc6-c3f2-41d9-a3d8-c686bf2c901d");
+    public static final TransportVersion V_8_500_033 = registerTransportVersion(8_500_033, "16871c8b-88ba-4432-980a-10fd9ecad2dc");
 
     private static class CurrentHolder {
-        private static final TransportVersion CURRENT = findCurrent(V_8_500_032);
+
+        private static final TransportVersion CURRENT = findCurrent(V_8_500_033);
 
         // finds the pluggable current version, or uses the given fallback
         private static TransportVersion findCurrent(TransportVersion fallback) {

diff --git a/.../src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java b/.../src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.action.admin.indices.analyze;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -16,16 +17,22 @@
 import java.util.Arrays;
 import java.util.Objects;
 
+import static org.elasticsearch.TransportVersion.V_8_500_033;
+
 /**
  * Request for reloading index search analyzers
  */
 public class ReloadAnalyzersRequest extends BroadcastRequest<ReloadAnalyzersRequest> {
     private final String resource;
     private final boolean preview;
 
+    private static final TransportVersion PREVIEW_OPTION_TRANSPORT_VERSION = V_8_500_033;
+
     /**
      * Constructs a request for reloading index search analyzers
      * @param resource changed resource to reload analyzers from, @null if not applicable
+     * @param preview {@code false} applies analyzer reloading. {@code true} previews the reloading operation, so analyzers are not reloaded
+     * but the results retrieved. This is useful for understanding analyzers usage in the different indices.
      * @param indices the indices to reload analyzers for
      */
     public ReloadAnalyzersRequest(String resource, boolean preview, String... indices) {
@@ -37,14 +44,16 @@ public ReloadAnalyzersRequest(String resource, boolean preview, String... indice
     public ReloadAnalyzersRequest(StreamInput in) throws IOException {
         super(in);
         this.resource = in.readOptionalString();
-        this.preview = in.readBoolean();
+        this.preview = in.getTransportVersion().onOrAfter(PREVIEW_OPTION_TRANSPORT_VERSION) && in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeOptionalString(resource);
-        out.writeBoolean(preview);
+        if (out.getTransportVersion().onOrAfter(PREVIEW_OPTION_TRANSPORT_VERSION)) {
+            out.writeBoolean(preview);
+        }
     }
 
     public String resource() {