Browse Source

Re-enable BWC tests and adjust versions after #77420 backport to 7.x (#79144)

Francisco Fernández Castaño 4 years ago
parent
commit
8b5d5ff900

+ 2 - 2
build.gradle

@@ -132,9 +132,9 @@ tasks.register("verifyVersions") {
  * after the backport of the backcompat code is complete.
  * after the backport of the backcompat code is complete.
  */
  */
 
 
-boolean bwc_tests_enabled = false
+boolean bwc_tests_enabled = true
 // place a PR link here when committing bwc changes:
 // place a PR link here when committing bwc changes:
-String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/77420"
+String bwc_tests_disabled_issue = ""
 /*
 /*
  * FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
  * 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
  * JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

+ 1 - 2
server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java

@@ -30,8 +30,7 @@ import java.util.stream.Collectors;
 
 
 public class RecoverySettings {
 public class RecoverySettings {
     public static final Version SNAPSHOT_RECOVERIES_SUPPORTED_VERSION = Version.V_7_15_0;
     public static final Version SNAPSHOT_RECOVERIES_SUPPORTED_VERSION = Version.V_7_15_0;
-    // TODO: update after backport
-    public static final Version SEQ_NO_SNAPSHOT_RECOVERIES_SUPPORTED_VERSION = Version.V_8_0_0;
+    public static final Version SEQ_NO_SNAPSHOT_RECOVERIES_SUPPORTED_VERSION = Version.V_7_16_0;
 
 
     private static final Logger logger = LogManager.getLogger(RecoverySettings.class);
     private static final Logger logger = LogManager.getLogger(RecoverySettings.class);