Răsfoiți Sursa

Enable bwc transform throttling (#56189)

re-enable and finish backport of #56184
Hendrik Muhs 5 ani în urmă
părinte
comite
febff64ca6

+ 2 - 2
build.gradle

@@ -183,8 +183,8 @@ task verifyVersions {
  * after the backport of the backcompat code is complete.
  */
 
-boolean bwc_tests_enabled = false
-final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/56184" /* place a PR link here when committing bwc changes */
+boolean bwc_tests_enabled = true
+final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

+ 4 - 4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java

@@ -66,7 +66,7 @@ public class UpdateTransformAction extends ActionType<UpdateTransformAction.Resp
         }
 
         public static Request fromStreamWithBWC(StreamInput in) throws IOException {
-            if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_8_0
+            if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
                 return new Request(in);
             }
             UpdateTransformActionPre78.Request r = new UpdateTransformActionPre78.Request(in);
@@ -130,7 +130,7 @@ public class UpdateTransformAction extends ActionType<UpdateTransformAction.Resp
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
                 super.writeTo(out);
                 update.writeTo(out);
                 out.writeString(id);
@@ -186,7 +186,7 @@ public class UpdateTransformAction extends ActionType<UpdateTransformAction.Resp
         }
 
         public static Response fromStreamWithBWC(StreamInput in) throws IOException {
-            if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_8_0
+            if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
                 return new Response(in);
             }
             UpdateTransformActionPre78.Response r = new UpdateTransformActionPre78.Response(in);
@@ -199,7 +199,7 @@ public class UpdateTransformAction extends ActionType<UpdateTransformAction.Resp
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
                 super.writeTo(out);
                 config.writeTo(out);
                 return;

+ 4 - 4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/compat/UpdateTransformActionPre78.java

@@ -41,7 +41,7 @@ public class UpdateTransformActionPre78 {
 
         public Request(StreamInput in) throws IOException {
             super(in);
-            assert in.getVersion().before(Version.V_8_0_0);// todo: V_7_8_0
+            assert in.getVersion().before(Version.V_7_8_0);
             this.update = new TransformConfigUpdate(in);
             this.id = in.readString();
             this.deferValidation = in.readBoolean();
@@ -65,7 +65,7 @@ public class UpdateTransformActionPre78 {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            assert out.getVersion().before(Version.V_8_0_0); // todo: V_7_8_0
+            assert out.getVersion().before(Version.V_7_8_0);
             super.writeTo(out);
             this.update.writeTo(out);
             out.writeString(id);
@@ -104,7 +104,7 @@ public class UpdateTransformActionPre78 {
         }
 
         public Response(StreamInput in) throws IOException {
-            assert in.getVersion().before(Version.V_8_0_0);  // todo: V_7_8_0
+            assert in.getVersion().before(Version.V_7_8_0);
             this.config = new TransformConfig(in);
         }
 
@@ -114,7 +114,7 @@ public class UpdateTransformActionPre78 {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            assert out.getVersion().before(Version.V_8_0_0);  // todo: V_7_8_0
+            assert out.getVersion().before(Version.V_7_8_0);
             this.config.writeTo(out);
         }
 

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java

@@ -224,7 +224,7 @@ public class TransformConfig extends AbstractDiffable<TransformConfig> implement
             createTime = null;
             transformVersion = null;
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_8_0
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             settings = new SettingsConfig(in);
         } else {
             settings = new SettingsConfig();
@@ -325,7 +325,7 @@ public class TransformConfig extends AbstractDiffable<TransformConfig> implement
                 out.writeBoolean(false);
             }
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_8_0
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             settings.writeTo(out);
         }
     }

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java

@@ -103,7 +103,7 @@ public class TransformConfigUpdate implements Writeable {
         if (in.readBoolean()) {
             setHeaders(in.readMap(StreamInput::readString, StreamInput::readString));
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {  // todo: V_7_8_0
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             settings = in.readOptionalWriteable(SettingsConfig::new);
         } else {
             settings = null;
@@ -158,7 +158,7 @@ public class TransformConfigUpdate implements Writeable {
         } else {
             out.writeBoolean(false);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeOptionalWriteable(settings);
         }
     }

+ 1 - 2
x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpdateTransformAction.java

@@ -213,8 +213,7 @@ public class TransportUpdateTransformAction extends TransportTasksAction<Transfo
                 if (transformTask != null
                     && transformTask.getState() instanceof TransformState
                     && ((TransformState) transformTask.getState()).getTaskState() != TransformTaskState.FAILED
-                    && clusterState.nodes().get(transformTask.getExecutorNode()).getVersion().onOrAfter(Version.V_8_0_0) // todo:
-                                                                                                                         // V_7_8_0
+                    && clusterState.nodes().get(transformTask.getExecutorNode()).getVersion().onOrAfter(Version.V_7_8_0)
                 ) {
                     request.setNodes(transformTask.getExecutorNode());
                     updateListener = ActionListener.wrap(updateResponse -> {