rename the new index version after backport

jimczi · Dec 11, 2024 · 7f3c5c9 · 7f3c5c9
1 parent 23cbc3e
commit 7f3c5c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.../internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java b/.../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
@@ -691,7 +691,7 @@ public void validate(Boolean enabled, Map<Setting<?>, 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
@@ -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
@@ -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 -> {})