From 864ad3d5c6c083e85844547b8d622ee5779fb1c3 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Fri, 3 Sep 2021 16:34:18 -0600 Subject: [PATCH 1/2] Adjust serialization ver. after backport of #77151 This commit adjusts the serialization version and re-enabled BWC tests following the backport of #77151. --- .../cluster/metadata/SingleNodeShutdownMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java index 93f82e29d9274..d2cf25f219303 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java @@ -35,7 +35,7 @@ public class SingleNodeShutdownMetadata extends AbstractDiffable { - public static final Version REPLACE_SHUTDOWN_TYPE_ADDED_VERSION = Version.V_8_0_0; + public static final Version REPLACE_SHUTDOWN_TYPE_ADDED_VERSION = Version.V_7_16_0; public static final ParseField NODE_ID_FIELD = new ParseField("node_id"); public static final ParseField TYPE_FIELD = new ParseField("type"); From 2213a84b4fbcc05a703ae39c4ed75e6e66a505d5 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 7 Sep 2021 15:56:16 -0600 Subject: [PATCH 2/2] Revert "Disable BWC for backport of #77151" This reverts commit 5530799bd3789bc91948945d19b879d1edbc313d. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cc4b21ed5a585..d567e231f9f65 100644 --- a/build.gradle +++ b/build.gradle @@ -138,9 +138,9 @@ tasks.register("verifyVersions") { * 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: -String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/77278" +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 * JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable