Browse Source

Adjust the RolloverAction version and re-enable BWC tests (#69225)

Joe Gallo 4 years ago
parent
commit
0305f77b0b

+ 2 - 2
build.gradle

@@ -189,8 +189,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/69202" /* 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

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java

@@ -84,7 +84,7 @@ public class RolloverAction implements LifecycleAction {
         } else {
             maxSize = null;
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0) && in.readBoolean()) {
+        if (in.getVersion().onOrAfter(Version.V_7_13_0) && in.readBoolean()) {
             maxSinglePrimarySize = new ByteSizeValue(in);
         } else {
             maxSinglePrimarySize = null;
@@ -100,7 +100,7 @@ public class RolloverAction implements LifecycleAction {
         if (hasMaxSize) {
             maxSize.writeTo(out);
         }
-        if (out.getVersion().onOrAfter((Version.V_8_0_0))) {
+        if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
             boolean hasMaxSinglePrimarySize = maxSinglePrimarySize != null;
             out.writeBoolean(hasMaxSinglePrimarySize);
             if (hasMaxSinglePrimarySize) {