-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Delay searchable snapshot allocation during shutdown (#86153)
During a shutdown, searchable snapshots should not be re-allocated to new nodes, since this leads to data download. Instead, now wait for the shutdown reallocation delay before reallocating shards. Fixes #85052
- Loading branch information
1 parent
4c69202
commit ace5edd
Showing
5 changed files
with
186 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pr: 86153 | ||
| summary: Delay searchable snapshot allocation during shutdown | ||
| area: "Snapshot/Restore" | ||
| type: bug | ||
| issues: | ||
| - 85052 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
...sticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotShutdownIntegTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.searchablesnapshots.allocation; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; | ||
| import org.elasticsearch.client.internal.Requests; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.CollectionUtils; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.snapshots.SnapshotId; | ||
| import org.elasticsearch.test.ESIntegTestCase; | ||
| import org.elasticsearch.test.InternalTestCluster; | ||
| import org.elasticsearch.xpack.searchablesnapshots.BaseSearchableSnapshotsIntegTestCase; | ||
| import org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots; | ||
| import org.elasticsearch.xpack.searchablesnapshots.cache.full.CacheService; | ||
| import org.elasticsearch.xpack.shutdown.DeleteShutdownNodeAction; | ||
| import org.elasticsearch.xpack.shutdown.PutShutdownNodeAction; | ||
| import org.elasticsearch.xpack.shutdown.ShutdownPlugin; | ||
| import org.hamcrest.Matchers; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.StreamSupport; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
|
|
||
| @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, minNumDataNodes = 2) | ||
| public class SearchableSnapshotShutdownIntegTests extends BaseSearchableSnapshotsIntegTestCase { | ||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
| return CollectionUtils.appendToCopy(super.nodePlugins(), ShutdownPlugin.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected int numberOfShards() { | ||
| // use 1 shard per index and instead use multiple indices to have multiple shards. | ||
| return 1; | ||
| } | ||
|
|
||
| public void testAllocationDisabledDuringShutdown() throws Exception { | ||
| final List<String> restoredIndexNames = setupMountedIndices(); | ||
| final String[] restoredIndexNamesArray = restoredIndexNames.toArray(String[]::new); | ||
| final Set<String> indexNodes = restoredIndexNames.stream() | ||
| .flatMap(index -> internalCluster().nodesInclude(index).stream()) | ||
| .collect(Collectors.toSet()); | ||
| final ClusterState state = client().admin().cluster().prepareState().clear().setRoutingTable(true).setNodes(true).get().getState(); | ||
| final Map<String, String> nodeNameToId = state.getNodes() | ||
| .stream() | ||
| .collect(Collectors.toMap(DiscoveryNode::getName, DiscoveryNode::getId)); | ||
|
|
||
| for (String indexNode : indexNodes) { | ||
| final String indexNodeId = nodeNameToId.get(indexNode); | ||
| putShutdown(indexNodeId); | ||
| final int shards = (int) StreamSupport.stream(state.routingTable().allShards(restoredIndexNamesArray).spliterator(), false) | ||
| .filter(s -> indexNodeId.equals(s.currentNodeId())) | ||
| .count(); | ||
| assert shards > 0; | ||
|
|
||
| assertExecutorIsIdle(SearchableSnapshots.CACHE_FETCH_ASYNC_THREAD_POOL_NAME); | ||
| assertExecutorIsIdle(SearchableSnapshots.CACHE_PREWARMING_THREAD_POOL_NAME); | ||
| waitForBlobCacheFillsToComplete(); | ||
| final CacheService cacheService = internalCluster().getInstance(CacheService.class, indexNode); | ||
| cacheService.synchronizeCache(); | ||
|
|
||
| logger.info("--> Restarting [{}/{}]", indexNodeId, indexNode); | ||
| internalCluster().restartNode(indexNode, new InternalTestCluster.RestartCallback() { | ||
| @Override | ||
| public Settings onNodeStopped(String nodeName) throws Exception { | ||
| assertBusy(() -> { | ||
| ClusterHealthResponse response = client().admin() | ||
| .cluster() | ||
| .health(Requests.clusterHealthRequest(restoredIndexNamesArray)) | ||
| .actionGet(); | ||
| assertThat(response.getUnassignedShards(), Matchers.equalTo(shards)); | ||
| }); | ||
| return super.onNodeStopped(nodeName); | ||
| } | ||
| }); | ||
| // leave shutdown in place for some nodes to check that shards get assigned anyway. | ||
| if (randomBoolean()) { | ||
| removeShutdown(indexNodeId); | ||
| } | ||
| } | ||
|
|
||
| ensureGreen(restoredIndexNamesArray); | ||
| } | ||
|
|
||
| private List<String> setupMountedIndices() throws Exception { | ||
| int count = between(1, 10); | ||
| List<String> restoredIndices = new ArrayList<>(); | ||
| final String repositoryName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); | ||
| createRepository(repositoryName, "mock"); | ||
|
|
||
| for (int i = 0; i < count; ++i) { | ||
| final String indexName = "index_" + i; | ||
| createAndPopulateIndex(indexName, Settings.builder()); | ||
|
|
||
| final SnapshotId snapshotId = createSnapshot(repositoryName, "snapshot-" + i, List.of(indexName)).snapshotId(); | ||
| assertAcked(client().admin().indices().prepareDelete(indexName)); | ||
| restoredIndices.add(mountSnapshot(repositoryName, snapshotId.getName(), indexName, Settings.EMPTY)); | ||
| } | ||
| return restoredIndices; | ||
| } | ||
|
|
||
| private void putShutdown(String nodeToRestartId) throws InterruptedException, ExecutionException { | ||
| PutShutdownNodeAction.Request putShutdownRequest = new PutShutdownNodeAction.Request( | ||
| nodeToRestartId, | ||
| SingleNodeShutdownMetadata.Type.RESTART, | ||
| this.getTestName(), | ||
| null, | ||
| null | ||
| ); | ||
| assertTrue(client().execute(PutShutdownNodeAction.INSTANCE, putShutdownRequest).get().isAcknowledged()); | ||
| } | ||
|
|
||
| private void removeShutdown(String node) throws ExecutionException, InterruptedException { | ||
| assertTrue(client().execute(DeleteShutdownNodeAction.INSTANCE, new DeleteShutdownNodeAction.Request(node)).get().isAcknowledged()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters