From 41024edddd150fa9e9f1220e2b83b9030d93b82b Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Fri, 18 Jun 2021 10:14:40 +0200 Subject: [PATCH 1/3] ILM mount snapshot step does need to set index.shard.check_on_startup Now the Mount API overrides the index.shard.check_on_startup setting value to `false`, there's no need for MountSnapshotStep to set it explicitly. --- .../elasticsearch/xpack/core/ilm/MountSnapshotStep.java | 4 +--- .../FrozenSearchableSnapshotsIntegTests.java | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/MountSnapshotStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/MountSnapshotStep.java index 7d1cd4fd5f369..d38747dbfa45a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/MountSnapshotStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/MountSnapshotStep.java @@ -16,7 +16,6 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; -import org.elasticsearch.index.IndexSettings; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDecider; import org.elasticsearch.xpack.core.DataTier; @@ -104,8 +103,7 @@ void performDuringNoSnapshot(IndexMetadata indexMetadata, ClusterState currentCl indexName = snapshotIndexName; } - Settings.Builder settingsBuilder = Settings.builder(); - settingsBuilder.put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), Boolean.FALSE.toString()); + final Settings.Builder settingsBuilder = Settings.builder(); // if we are mounting a searchable snapshot in the hot phase, then the index should be pinned to the hot nodes if (TimeseriesLifecycleType.HOT_PHASE.equals(this.getKey().getPhase())) { settingsBuilder.put(DataTierAllocationDecider.INDEX_ROUTING_PREFER, DataTier.DATA_HOT); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java index 5c1688ed1e114..166b9eafc6700 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java @@ -166,13 +166,6 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception { } else { expectedReplicas = 0; } - final String indexCheckOnStartup; - if (randomBoolean()) { - indexCheckOnStartup = randomFrom("false", "true", "checksum"); - indexSettingsBuilder.put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), indexCheckOnStartup); - } else { - indexCheckOnStartup = "false"; - } final String expectedDataTiersPreference; expectedDataTiersPreference = getDataTiersPreference(MountSearchableSnapshotRequest.Storage.SHARED_CACHE); From 81ea8907c8a6fa930190a5ce26d44734c0b576c1 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Fri, 18 Jun 2021 10:29:41 +0200 Subject: [PATCH 2/3] unmute --- .../searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java index 052e23f495159..166b9eafc6700 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java @@ -71,7 +71,6 @@ public class FrozenSearchableSnapshotsIntegTests extends BaseFrozenSearchableSnapshotsIntegTestCase { - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/74282") public void testCreateAndRestorePartialSearchableSnapshot() throws Exception { final String fsRepoName = randomAlphaOfLength(10); final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); From 78f9147332bfc794ff4645745bc54057762fe885 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Fri, 18 Jun 2021 10:42:12 +0200 Subject: [PATCH 3/3] feedback --- .../FrozenSearchableSnapshotsIntegTests.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java index 166b9eafc6700..17daeef58952c 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java @@ -166,6 +166,13 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception { } else { expectedReplicas = 0; } + final String indexCheckOnStartup; + if (randomBoolean()) { + indexCheckOnStartup = randomFrom("false", "true", "checksum"); + indexSettingsBuilder.put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), indexCheckOnStartup); + } else { + indexCheckOnStartup = "false"; + } final String expectedDataTiersPreference; expectedDataTiersPreference = getDataTiersPreference(MountSearchableSnapshotRequest.Storage.SHARED_CACHE); @@ -284,7 +291,7 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception { assertThat(DataTierAllocationDecider.INDEX_ROUTING_PREFER_SETTING.get(settings), equalTo(expectedDataTiersPreference)); assertTrue(SearchableSnapshotsConstants.SNAPSHOT_PARTIAL_SETTING.get(settings)); assertTrue(DiskThresholdDecider.SETTING_IGNORE_DISK_WATERMARKS.get(settings)); - assertThat(IndexSettings.INDEX_CHECK_ON_STARTUP.get(settings), equalTo("false")); + assertThat(IndexSettings.INDEX_CHECK_ON_STARTUP.get(settings), equalTo(indexCheckOnStartup)); checkSoftDeletesNotEagerlyLoaded(restoredIndexName); assertTotalHits(restoredIndexName, originalAllHits, originalBarHits);