Cleanup shutdown module bwc in v9 (#112793)

DaveCTurner · web-flow · commit d1d29773b0aa · 2024-09-12T19:58:20.000+10:00
Removes a bunch of now-unnecessary bwc code in the shutdown module.
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java
@@ -15,12 +15,9 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 
 import java.io.IOException;
 
-import static org.elasticsearch.xpack.shutdown.ShutdownPlugin.serializesWithParentTaskAndTimeouts;
-
 public class DeleteShutdownNodeAction extends ActionType<AcknowledgedResponse> {
 
     public static final DeleteShutdownNodeAction INSTANCE = new DeleteShutdownNodeAction();
@@ -39,32 +36,14 @@ public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, String nodeId)
             this.nodeId = nodeId;
         }
 
-        @UpdateForV9 // inline when bwc no longer needed
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(in.getTransportVersion())) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion());
             this.nodeId = in.readString();
         }
 
-        @UpdateForV9 // remove when bwc no longer needed
-        private Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, StreamInput in) throws IOException {
-            this(masterNodeTimeout, ackTimeout, in.readString());
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion()) == false;
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(out.getTransportVersion())) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeString(this.nodeId);
         }
 
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java
@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.shutdown;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
@@ -19,7 +18,6 @@
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.common.xcontent.ChunkedToXContentObject;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.tasks.CancellableTask;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.tasks.TaskId;
@@ -50,33 +48,14 @@ public Request(TimeValue masterNodeTimeout, String... nodeIds) {
             this.nodeIds = nodeIds;
         }
 
-        @UpdateForV9 // only needed for bwc, inline in v9
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (in.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT)) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert in.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT);
-            nodeIds = in.readStringArray();
-        }
-
-        @UpdateForV9 // only needed for bwc, remove in v9
-        private Request(TimeValue masterNodeTimeout, StreamInput in) throws IOException {
-            super(masterNodeTimeout);
-            assert in.getTransportVersion().before(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT);
             nodeIds = in.readStringArray();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT)) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeStringArray(this.nodeIds);
         }
 
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java
@@ -17,17 +17,13 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
 
-import static org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata.GRACE_PERIOD_ADDED_VERSION;
-import static org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata.REPLACE_SHUTDOWN_TYPE_ADDED_VERSION;
 import static org.elasticsearch.core.Strings.format;
-import static org.elasticsearch.xpack.shutdown.ShutdownPlugin.serializesWithParentTaskAndTimeouts;
 
 public class PutShutdownNodeAction extends ActionType<AcknowledgedResponse> {
 
@@ -112,18 +108,8 @@ public Request(
             this.gracePeriod = gracePeriod;
         }
 
-        @UpdateForV9 // inline when bwc no longer needed
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(in.getTransportVersion())) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion());
             this.nodeId = in.readString();
             this.type = in.readEnum(SingleNodeShutdownMetadata.Type.class);
             this.reason = in.readString();
@@ -132,46 +118,15 @@ private Request(StreamInput in) throws IOException {
             this.gracePeriod = in.readOptionalTimeValue();
         }
 
-        @UpdateForV9 // remove when bwc no longer needed
-        private Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, StreamInput in) throws IOException {
-            super(masterNodeTimeout, ackTimeout);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion()) == false;
-            this.nodeId = in.readString();
-            this.type = in.readEnum(SingleNodeShutdownMetadata.Type.class);
-            this.reason = in.readString();
-            this.allocationDelay = in.readOptionalTimeValue();
-            if (in.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-                this.targetNodeName = in.readOptionalString();
-            } else {
-                this.targetNodeName = null;
-            }
-            if (in.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
-                this.gracePeriod = in.readOptionalTimeValue();
-            } else {
-                this.gracePeriod = null;
-            }
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(out.getTransportVersion())) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeString(nodeId);
-            if (out.getTransportVersion().before(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)
-                && this.type == SingleNodeShutdownMetadata.Type.REPLACE) {
-                out.writeEnum(SingleNodeShutdownMetadata.Type.REMOVE);
-            } else {
-                out.writeEnum(type);
-            }
+            out.writeEnum(type);
             out.writeString(reason);
             out.writeOptionalTimeValue(allocationDelay);
-            if (out.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-                out.writeOptionalString(targetNodeName);
-            }
-            if (out.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
-                out.writeOptionalTimeValue(gracePeriod);
-            }
+            out.writeOptionalString(targetNodeName);
+            out.writeOptionalTimeValue(gracePeriod);
         }
 
         public String getNodeId() {
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java
@@ -6,8 +6,6 @@
  */
 package org.elasticsearch.xpack.shutdown;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -18,7 +16,6 @@
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
@@ -72,11 +69,4 @@ public List<RestHandler> getRestHandlers(
     ) {
         return Arrays.asList(new RestPutShutdownNodeAction(), new RestDeleteShutdownNodeAction(), new RestGetShutdownStatusAction());
     }
-
-    @UpdateForV9 // always true in v9 so can be removed
-    static boolean serializesWithParentTaskAndTimeouts(TransportVersion transportVersion) {
-        return transportVersion.isPatchFrom(TransportVersions.V_8_13_4)
-            || transportVersion.isPatchFrom(TransportVersions.V_8_14_0)
-            || transportVersion.onOrAfter(TransportVersions.SHUTDOWN_REQUEST_TIMEOUTS_FIX);
-    }
 }
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
@@ -120,7 +120,7 @@ public TransportDeleteShutdownNodeAction(
             clusterService,
             threadPool,
             actionFilters,
-            Request::readFrom,
+            Request::new,
             indexNameExpressionResolver,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
@@ -88,7 +88,7 @@ public TransportGetShutdownStatusAction(
             clusterService,
             threadPool,
             actionFilters,
-            GetShutdownStatusAction.Request::readFrom,
+            GetShutdownStatusAction.Request::new,
             indexNameExpressionResolver,
             GetShutdownStatusAction.Response::new,
             threadPool.executor(ThreadPool.Names.MANAGEMENT)
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
@@ -156,7 +156,7 @@ public TransportPutShutdownNodeAction(
             clusterService,
             threadPool,
             actionFilters,
-            Request::readFrom,
+            Request::new,
             indexNameExpressionResolver,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java
@@ -33,7 +33,7 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     protected Writeable.Reader<RequestWrapper> instanceReader() {
         return in -> {
-            final var request = DeleteShutdownNodeAction.Request.readFrom(in);
+            final var request = new DeleteShutdownNodeAction.Request(in);
             return new RequestWrapper(request.getNodeId(), request.getParentTask(), request.masterNodeTimeout(), request.ackTimeout());
         };
     }
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java
@@ -19,7 +19,7 @@ public class GetShutdownStatusRequestTests extends AbstractWireSerializingTestCa
 
     @Override
     protected Writeable.Reader<GetShutdownStatusAction.Request> instanceReader() {
-        return GetShutdownStatusAction.Request::readFrom;
+        return GetShutdownStatusAction.Request::new;
     }
 
     @Override
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java
@@ -53,7 +53,7 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     protected Writeable.Reader<RequestWrapper> instanceReader() {
         return in -> {
-            final var request = PutShutdownNodeAction.Request.readFrom(in);
+            final var request = new PutShutdownNodeAction.Request(in);
             return new RequestWrapper(
                 request.getNodeId(),
                 request.getType(),

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void writeTo(StreamOutput out) throws IOException {`
`33`	`33`	`@Override`
`34`	`34`	`protected Writeable.Reader<RequestWrapper> instanceReader() {`
`35`	`35`	`return in -> {`
`36`		`- final var request = DeleteShutdownNodeAction.Request.readFrom(in);`
	`36`	`+ final var request = new DeleteShutdownNodeAction.Request(in);`
`37`	`37`	`return new RequestWrapper(request.getNodeId(), request.getParentTask(), request.masterNodeTimeout(), request.ackTimeout());`
`38`	`38`	`};`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class GetShutdownStatusRequestTests extends AbstractWireSerializingTestCa`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`protected Writeable.Reader<GetShutdownStatusAction.Request> instanceReader() {`
`22`		`- return GetShutdownStatusAction.Request::readFrom;`
	`22`	`+ return GetShutdownStatusAction.Request::new;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`