From 7f3c5c9940c58e9bee478979ed9a5c35c233f33c Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 11 Dec 2024 08:58:14 +0000 Subject: [PATCH] rename the new index version after backport --- .../action/admin/indices/create/CloneIndexIT.java | 4 ++-- .../src/main/java/org/elasticsearch/index/IndexSettings.java | 2 +- .../src/main/java/org/elasticsearch/index/IndexVersions.java | 2 +- .../elasticsearch/index/mapper/SourceFieldMapperTests.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java index 47f96aebacd7d..deb191b4f1ce2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java @@ -152,7 +152,7 @@ public void testResizeChangeRecoveryUseSyntheticSource() { "index.version.created", IndexVersionUtils.randomVersionBetween( random(), - IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY, + IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT, IndexVersion.current() ) ) @@ -167,7 +167,7 @@ public void testResizeChangeRecoveryUseSyntheticSource() { "index.version.created", IndexVersionUtils.randomVersionBetween( random(), - IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY, + IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT, IndexVersion.current() ) ) diff --git a/server/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java index 2f2863abd5382..751b194af3d50 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexSettings.java +++ b/server/src/main/java/org/elasticsearch/index/IndexSettings.java @@ -691,7 +691,7 @@ public void validate(Boolean enabled, Map, Object> settings) { // Verify that all nodes can handle this setting var version = (IndexVersion) settings.get(SETTING_INDEX_VERSION_CREATED); - if (version.before(IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY)) { + if (version.before(IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT)) { throw new IllegalArgumentException( String.format( Locale.ROOT, diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java index 4f9fb5f3edf86..cc565be67f2c6 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexVersions.java +++ b/server/src/main/java/org/elasticsearch/index/IndexVersions.java @@ -122,7 +122,7 @@ private static IndexVersion def(int id, Version luceneVersion) { public static final IndexVersion LOGSDB_DEFAULT_IGNORE_DYNAMIC_BEYOND_LIMIT_BACKPORT = def(8_519_00_0, Version.LUCENE_9_12_0); public static final IndexVersion TIME_BASED_K_ORDERED_DOC_ID_BACKPORT = def(8_520_00_0, Version.LUCENE_9_12_0); public static final IndexVersion DEPRECATE_SOURCE_MODE_MAPPER = def(8_521_00_0, Version.LUCENE_9_12_0); - public static final IndexVersion USE_SYNTHETIC_SOURCE_FOR_RECOVERY = def(8_522_00_0, Version.LUCENE_9_12_0); + public static final IndexVersion USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT = def(8_522_00_0, Version.LUCENE_9_12_0); /* * STOP! READ THIS FIRST! No, really, * ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _ diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java index bec9cb5fa9be0..e844edd27f1ab 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java @@ -473,7 +473,7 @@ public void testRecoverySourceWitInvalidSettings() { IllegalArgumentException exc = expectThrows( IllegalArgumentException.class, () -> createMapperService( - IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY), + IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT), settings, () -> false, topMapping(b -> {})