serialise patch

Author: davidkyle

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -246,6 +246,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_PER_AGGREGATE_FILTER = def(8_770_00_0);
     public static final TransportVersion ML_INFERENCE_ATTACH_TO_EXISTSING_DEPLOYMENT = def(8_771_00_0);
     public static final TransportVersion CONVERT_FAILURE_STORE_OPTIONS_TO_SELECTOR_OPTIONS_INTERNALLY = def(8_772_00_0);
+    public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16 = def(8_772_00_1);
 
     /*
      * STOP! READ THIS FIRST! No, really,

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.core.inference.action;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
@@ -36,6 +37,13 @@ public static class Request extends AcknowledgedRequest<GetInferenceModelAction.
 
         private static boolean PERSIST_DEFAULT_CONFIGS = true;
 
+        public static boolean shouldReadPersistDefault(TransportVersion transportVersion) {
+            // This constant is defined on future branches but we need to know about it here
+            final TransportVersion INFERENCE_DONT_PERSIST_ON_READ = new TransportVersion(8_776_00_0);
+            return transportVersion.onOrAfter(INFERENCE_DONT_PERSIST_ON_READ) ||
+                transportVersion.isPatchFrom(TransportVersions.INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16);
+        }
+
         private final String inferenceEntityId;
         private final TaskType taskType;
         // Default endpoint configurations are persisted on first read.
@@ -62,12 +70,11 @@ public Request(StreamInput in) throws IOException {
             super(in);
             this.inferenceEntityId = in.readString();
             this.taskType = TaskType.fromStream(in);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_DONT_PERSIST_ON_READ)) {
+            if (shouldReadPersistDefault(in.getTransportVersion())) {
                 this.persistDefaultConfig = in.readBoolean();
             } else {
                 this.persistDefaultConfig = PERSIST_DEFAULT_CONFIGS;
             }
-
         }
 
         public String getInferenceEntityId() {
@@ -87,7 +94,7 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(inferenceEntityId);
             taskType.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_DONT_PERSIST_ON_READ)) {
+            if (shouldReadPersistDefault(out.getTransportVersion())) {
                 out.writeBoolean(this.persistDefaultConfig);
             }
         }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/GetInferenceModelRequestTests.java

@@ -7,17 +7,34 @@
 
 package org.elasticsearch.xpack.inference.action;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
 import org.elasticsearch.xpack.core.inference.action.GetInferenceModelAction;
 
+import static org.elasticsearch.TransportVersions.INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16;
+
 public class GetInferenceModelRequestTests extends AbstractWireSerializingTestCase<GetInferenceModelAction.Request> {
 
     public static GetInferenceModelAction.Request randomTestInstance() {
         return new GetInferenceModelAction.Request(randomAlphaOfLength(8), randomFrom(TaskType.values()), randomBoolean());
     }
 
+    public void testShouldReadPersistDefault() {
+        var previousVersion = new TransportVersion(INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16.id() - 1000);
+        assertFalse(GetInferenceModelAction.Request.shouldReadPersistDefault(previousVersion));
+
+        var patchOnSameVersion = new TransportVersion(INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16.id() + 1);
+        assertTrue(GetInferenceModelAction.Request.shouldReadPersistDefault(patchOnSameVersion));
+
+        var nextVersion = new TransportVersion(INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16.id() + 1000);
+        assertFalse(GetInferenceModelAction.Request.shouldReadPersistDefault(nextVersion));
+
+        var versionChangedInForwardBranch = new TransportVersion(8_776_00_0);
+        assertTrue(GetInferenceModelAction.Request.shouldReadPersistDefault(versionChangedInForwardBranch));
+    }
+
     @Override
     protected Writeable.Reader<GetInferenceModelAction.Request> instanceReader() {
         return GetInferenceModelAction.Request::new;