remove leftover

jimczi · Nov 6, 2024 · b99f66f · b99f66f
1 parent edd38bb
commit b99f66f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
@@ -397,13 +397,6 @@ public Iterator<Setting<?>> settings() {
         Property.NodeScope
     );
 
-    public static final Setting<Boolean> INDICES_RECOVERY_SOURCE_SYNTHETIC_LOGS_ENABLED_SETTING = Setting.boolSetting(
-        "index.recovery.recovery_source.synthetic.logs.enabled",
-        true,
-        Property.Dynamic,
-        Property.NodeScope
-    );
-
     public static final ByteSizeValue DEFAULT_CHUNK_SIZE = new ByteSizeValue(512, ByteSizeUnit.KB);
 
     private volatile ByteSizeValue maxBytesPerSec;

diff --git a/...ugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java b/...ugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
@@ -94,7 +94,7 @@ public void setUp() throws Exception {
         index = new Index("index", "uuid");
         shardId = new ShardId(index, 0);
         primaryTerm.set(randomLongBetween(1, Long.MAX_VALUE));
-        indexMode = IndexMode.TIME_SERIES;// randomFrom(IndexMode.values());
+        indexMode = randomFrom(IndexMode.values());
     }
 
     @Override

diff --git a/...c/test/java/org/elasticsearch/xpack/logsdb/SyntheticSourceIndexSettingsProviderTests.java b/...c/test/java/org/elasticsearch/xpack/logsdb/SyntheticSourceIndexSettingsProviderTests.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.MapperTestUtils;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.license.MockLicenseState;
@@ -280,7 +279,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSource() throws
             .build();
 
         Settings result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             null,
@@ -294,7 +292,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSource() throws
 
         syntheticSourceLicenseService.setSyntheticSourceFallback(true);
         result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             null,
@@ -308,7 +305,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSource() throws
         assertThat(newMapperServiceCounter.get(), equalTo(0));
 
         result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             IndexMode.TIME_SERIES,
@@ -322,7 +318,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSource() throws
         assertThat(newMapperServiceCounter.get(), equalTo(0));
 
         result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             IndexMode.LOGSDB,
@@ -357,7 +352,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSourceFileMatch(
         );
         Metadata metadata = mb.build();
         Settings result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             null,
@@ -382,7 +376,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSourceFileMatch(
         metadata = mb.build();
 
         result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             null,
@@ -396,7 +389,6 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSourceFileMatch(
         assertThat(newMapperServiceCounter.get(), equalTo(0));
 
         result = provider.getAdditionalIndexSettings(
-            IndexVersion.current(),
             DataStream.getDefaultBackingIndexName(dataStreamName, 2),
             dataStreamName,
             null,