From b99f66fed58ec1c377da42cec1f58c1de0eaef63 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 6 Nov 2024 12:53:34 +0000 Subject: [PATCH] remove leftover --- .../elasticsearch/indices/recovery/RecoverySettings.java | 7 ------- .../xpack/ccr/index/engine/FollowingEngineTests.java | 2 +- .../logsdb/SyntheticSourceIndexSettingsProviderTests.java | 8 -------- 3 files changed, 1 insertion(+), 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 index 567ea19e46f2f..1ec187ea4a34b 100644 --- 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> settings() { Property.NodeScope ); - public static final Setting 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/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java index 8cca49223ed58..e22f7fb54de76 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java +++ b/x-pack/plugin/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/x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/SyntheticSourceIndexSettingsProviderTests.java b/x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/SyntheticSourceIndexSettingsProviderTests.java index d65f17f07cf11..2d8723a0d8c25 100644 --- a/x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/SyntheticSourceIndexSettingsProviderTests.java +++ b/x-pack/plugin/logsdb/src/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,