From 20ed7d7ffa08cb831099db385efa27e472d6fba5 Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Tue, 11 Aug 2020 14:31:24 -0600 Subject: [PATCH] Adjust IndexMetadata serialization version (#60988) This change adjusts the IndexMetadata serialization version for the system index flag after the backport of #57936. Additionally, bwc tests have been reenabled. --- build.gradle | 4 ++-- .../org/elasticsearch/cluster/metadata/IndexMetadata.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6da8f48f525e0..44f3d4559ec0a 100644 --- a/build.gradle +++ b/build.gradle @@ -174,8 +174,8 @@ tasks.register("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/57936" /* 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") diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java index d2b367dce3205..667e7ca5ea6d7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java @@ -345,7 +345,7 @@ public static APIBlock readFrom(StreamInput input) throws IOException { public static final String INDEX_STATE_FILE_PREFIX = "state-"; - static final Version SYSTEM_INDEX_FLAG_ADDED = Version.V_8_0_0; + static final Version SYSTEM_INDEX_FLAG_ADDED = Version.V_7_10_0; private final int routingNumShards; private final int routingFactor;