[Transform] finalize backport of retention_policy and reenable BWC (#…

…68884) finalize backport of #67832
elastic · Feb 11, 2021 · 91bcce9 · 91bcce9
1 parent d15c22f
commit 91bcce9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -169,8 +169,8 @@ tasks.register("verifyVersions") {
  * after the backport of the backcompat code is complete.
  */
 
-boolean bwc_tests_enabled = false
-String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/68814" /* place a PR link here when committing bwc changes */
+boolean bwc_tests_enabled = true
+String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
 /*
  * FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
  * JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

diff --git a/...core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java b/...core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java
@@ -227,7 +227,7 @@ public TransformConfig(final StreamInput in) throws IOException {
         } else {
             settings = new SettingsConfig();
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0
+        if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
             retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class);
         } else {
             retentionPolicyConfig = null;
@@ -366,7 +366,7 @@ public void writeTo(final StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             settings.writeTo(out);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0
+        if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
             out.writeOptionalNamedWriteable(retentionPolicyConfig);
         }
     }

diff --git a/...rc/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java b/...rc/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java
@@ -122,7 +122,7 @@ public TransformConfigUpdate(final StreamInput in) throws IOException {
         } else {
             settings = null;
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0
+        if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
             retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class);
         } else {
             retentionPolicyConfig = null;
@@ -184,7 +184,7 @@ public void writeTo(final StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeOptionalWriteable(settings);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0
+        if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
             out.writeOptionalNamedWriteable(retentionPolicyConfig);
         }
     }

diff --git a/...rc/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java b/...rc/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java
@@ -182,7 +182,7 @@ public TransformIndexerStats(StreamInput in) throws IOException {
             this.expAvgDocumentsIndexed = in.readDouble();
             this.expAvgDocumentsProcessed = in.readDouble();
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {  // todo: V_7_12_0
+        if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
             this.numDeletedDocuments = in.readVLong();
             this.deleteTime = in.readVLong();
         }
@@ -199,7 +199,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeDouble(this.expAvgDocumentsIndexed);
             out.writeDouble(this.expAvgDocumentsProcessed);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0
+        if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
             out.writeVLong(numDeletedDocuments);
             out.writeVLong(deleteTime);
         }