-
Notifications
You must be signed in to change notification settings - Fork 24.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use ClusterState as Consistency Source for Snapshot Repositories #49060
Merged
original-brownbear
merged 26 commits into
elastic:master
from
original-brownbear:repo-uses-cs
Dec 17, 2019
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
6bef703
Consistent RepositoryData Load on Blobstores
original-brownbear 303b62b
last step
original-brownbear b4c7861
fix tests
original-brownbear 3e5236a
cs
original-brownbear fa5d932
fix tests
original-brownbear ae86319
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear 62999ea
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear 8ff4b80
updated docs
original-brownbear 8a85853
simpler
original-brownbear a9d01c2
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear 60208f6
simpler
original-brownbear 4c7e179
Merge branch 'master' of https://github.com/elastic/elasticsearch int…
original-brownbear 89fe273
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear ed9509d
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear 4869b26
remove repository initialization
original-brownbear 4285894
remove repository initialization
original-brownbear 5117a04
add setting overrid
original-brownbear 8842cff
fix test
original-brownbear 7313d38
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear cb84ee1
rename an remove pointless prop
original-brownbear 2158ea7
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear 3dfcf10
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear e3f7ff2
correct handling unclean full cluster restart
original-brownbear 564202b
docs
original-brownbear 028e860
stable
original-brownbear edde42f
Merge remote-tracking branch 'elastic/master' into repo-uses-cs
original-brownbear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
215 changes: 172 additions & 43 deletions
215
server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
247 changes: 247 additions & 0 deletions
247
server/src/test/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.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,247 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.snapshots; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; | ||
| import org.elasticsearch.action.support.PlainActionFuture; | ||
| import org.elasticsearch.client.Client; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.ClusterStateUpdateTask; | ||
| import org.elasticsearch.cluster.metadata.MetaData; | ||
| import org.elasticsearch.cluster.metadata.RepositoriesMetaData; | ||
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.unit.ByteSizeUnit; | ||
| import org.elasticsearch.repositories.RepositoriesService; | ||
| import org.elasticsearch.repositories.Repository; | ||
| import org.elasticsearch.repositories.RepositoryData; | ||
| import org.elasticsearch.repositories.RepositoryException; | ||
| import org.elasticsearch.repositories.blobstore.BlobStoreRepository; | ||
|
|
||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.greaterThan; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCase { | ||
|
|
||
| public void testConcurrentlyChangeRepositoryContents() throws Exception { | ||
| Client client = client(); | ||
|
|
||
| Path repo = randomRepoPath(); | ||
| final String repoName = "test-repo"; | ||
| logger.info("--> creating repository at {}", repo.toAbsolutePath()); | ||
| assertAcked(client.admin().cluster().preparePutRepository(repoName) | ||
| .setType("fs").setSettings(Settings.builder() | ||
| .put("location", repo) | ||
| .put("compress", false) | ||
| .put("chunk_size", randomIntBetween(100, 1000), ByteSizeUnit.BYTES))); | ||
|
|
||
| createIndex("test-idx-1", "test-idx-2"); | ||
| logger.info("--> indexing some data"); | ||
| indexRandom(true, | ||
| client().prepareIndex("test-idx-1").setSource("foo", "bar"), | ||
| client().prepareIndex("test-idx-2").setSource("foo", "bar")); | ||
|
|
||
| final String snapshot = "test-snap"; | ||
|
|
||
| logger.info("--> creating snapshot"); | ||
| CreateSnapshotResponse createSnapshotResponse = client.admin().cluster().prepareCreateSnapshot(repoName, snapshot) | ||
| .setWaitForCompletion(true).setIndices("test-idx-*").get(); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0)); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), | ||
| equalTo(createSnapshotResponse.getSnapshotInfo().totalShards())); | ||
|
|
||
| logger.info("--> move index-N blob to next generation"); | ||
| final RepositoryData repositoryData = | ||
| getRepositoryData(internalCluster().getMasterNodeInstance(RepositoriesService.class).repository(repoName)); | ||
| Files.move(repo.resolve("index-" + repositoryData.getGenId()), repo.resolve("index-" + (repositoryData.getGenId() + 1))); | ||
|
|
||
| assertRepositoryBlocked(client, repoName, snapshot); | ||
|
|
||
| if (randomBoolean()) { | ||
| logger.info("--> move index-N blob back to initial generation"); | ||
| Files.move(repo.resolve("index-" + (repositoryData.getGenId() + 1)), repo.resolve("index-" + repositoryData.getGenId())); | ||
|
|
||
| logger.info("--> verify repository remains blocked"); | ||
| assertRepositoryBlocked(client, repoName, snapshot); | ||
| } | ||
|
|
||
| logger.info("--> remove repository"); | ||
| assertAcked(client.admin().cluster().prepareDeleteRepository(repoName)); | ||
|
|
||
| logger.info("--> recreate repository"); | ||
| assertAcked(client.admin().cluster().preparePutRepository(repoName) | ||
| .setType("fs").setSettings(Settings.builder() | ||
| .put("location", repo) | ||
| .put("compress", false) | ||
| .put("chunk_size", randomIntBetween(100, 1000), ByteSizeUnit.BYTES))); | ||
|
|
||
| logger.info("--> delete snapshot"); | ||
| client.admin().cluster().prepareDeleteSnapshot(repoName, snapshot).get(); | ||
|
|
||
| logger.info("--> make sure snapshot doesn't exist"); | ||
| expectThrows(SnapshotMissingException.class, () -> client.admin().cluster().prepareGetSnapshots(repoName) | ||
| .addSnapshots(snapshot).get().getSnapshots(repoName)); | ||
| } | ||
|
|
||
| public void testConcurrentlyChangeRepositoryContentsInBwCMode() throws Exception { | ||
| Client client = client(); | ||
|
|
||
| Path repo = randomRepoPath(); | ||
| final String repoName = "test-repo"; | ||
| logger.info("--> creating repository at {}", repo.toAbsolutePath()); | ||
| assertAcked(client.admin().cluster().preparePutRepository(repoName) | ||
| .setType("fs").setSettings(Settings.builder() | ||
| .put("location", repo) | ||
| .put("compress", false) | ||
| .put(BlobStoreRepository.ALLOW_CONCURRENT_MODIFICATION.getKey(), true) | ||
| .put("chunk_size", randomIntBetween(100, 1000), ByteSizeUnit.BYTES))); | ||
|
|
||
| createIndex("test-idx-1", "test-idx-2"); | ||
| logger.info("--> indexing some data"); | ||
| indexRandom(true, | ||
| client().prepareIndex("test-idx-1").setSource("foo", "bar"), | ||
| client().prepareIndex("test-idx-2").setSource("foo", "bar")); | ||
|
|
||
| final String snapshot = "test-snap"; | ||
|
|
||
| logger.info("--> creating snapshot"); | ||
| CreateSnapshotResponse createSnapshotResponse = client.admin().cluster().prepareCreateSnapshot(repoName, snapshot) | ||
| .setWaitForCompletion(true).setIndices("test-idx-*").get(); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0)); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), | ||
| equalTo(createSnapshotResponse.getSnapshotInfo().totalShards())); | ||
|
|
||
| final Repository repository = internalCluster().getMasterNodeInstance(RepositoriesService.class).repository(repoName); | ||
|
|
||
| logger.info("--> move index-N blob to next generation"); | ||
| final RepositoryData repositoryData = getRepositoryData(repository); | ||
| final long beforeMoveGen = repositoryData.getGenId(); | ||
| Files.move(repo.resolve("index-" + beforeMoveGen), repo.resolve("index-" + (beforeMoveGen + 1))); | ||
|
|
||
| logger.info("--> verify index-N blob is found at the new location"); | ||
| assertThat(getRepositoryData(repository).getGenId(), is(beforeMoveGen + 1)); | ||
|
|
||
| logger.info("--> delete snapshot"); | ||
| client.admin().cluster().prepareDeleteSnapshot(repoName, snapshot).get(); | ||
|
|
||
| logger.info("--> verify index-N blob is found at the expected location"); | ||
| assertThat(getRepositoryData(repository).getGenId(), is(beforeMoveGen + 2)); | ||
|
|
||
| logger.info("--> make sure snapshot doesn't exist"); | ||
| expectThrows(SnapshotMissingException.class, () -> client.admin().cluster().prepareGetSnapshots(repoName) | ||
| .addSnapshots(snapshot).get().getSnapshots(repoName)); | ||
| } | ||
|
|
||
| public void testFindDanglingLatestGeneration() throws Exception { | ||
| Path repo = randomRepoPath(); | ||
| final String repoName = "test-repo"; | ||
| logger.info("--> creating repository at {}", repo.toAbsolutePath()); | ||
| assertAcked(client().admin().cluster().preparePutRepository(repoName) | ||
| .setType("fs").setSettings(Settings.builder() | ||
| .put("location", repo) | ||
| .put("compress", false) | ||
| .put("chunk_size", randomIntBetween(100, 1000), ByteSizeUnit.BYTES))); | ||
|
|
||
| createIndex("test-idx-1", "test-idx-2"); | ||
| logger.info("--> indexing some data"); | ||
| indexRandom(true, | ||
| client().prepareIndex("test-idx-1").setSource("foo", "bar"), | ||
| client().prepareIndex("test-idx-2").setSource("foo", "bar")); | ||
|
|
||
| final String snapshot = "test-snap"; | ||
|
|
||
| logger.info("--> creating snapshot"); | ||
| CreateSnapshotResponse createSnapshotResponse = client().admin().cluster().prepareCreateSnapshot(repoName, snapshot) | ||
| .setWaitForCompletion(true).setIndices("test-idx-*").get(); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0)); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), | ||
| equalTo(createSnapshotResponse.getSnapshotInfo().totalShards())); | ||
|
|
||
| final Repository repository = internalCluster().getCurrentMasterNodeInstance(RepositoriesService.class).repository(repoName); | ||
|
|
||
| logger.info("--> move index-N blob to next generation"); | ||
| final RepositoryData repositoryData = getRepositoryData(repository); | ||
| final long beforeMoveGen = repositoryData.getGenId(); | ||
| Files.move(repo.resolve("index-" + beforeMoveGen), repo.resolve("index-" + (beforeMoveGen + 1))); | ||
|
|
||
| logger.info("--> set next generation as pending in the cluster state"); | ||
| final PlainActionFuture<Void> csUpdateFuture = PlainActionFuture.newFuture(); | ||
| internalCluster().getCurrentMasterNodeInstance(ClusterService.class).submitStateUpdateTask("set pending generation", | ||
| new ClusterStateUpdateTask() { | ||
| @Override | ||
| public ClusterState execute(ClusterState currentState) { | ||
| return ClusterState.builder(currentState).metaData(MetaData.builder(currentState.getMetaData()) | ||
| .putCustom(RepositoriesMetaData.TYPE, | ||
| currentState.metaData().<RepositoriesMetaData>custom(RepositoriesMetaData.TYPE).withUpdatedGeneration( | ||
| repository.getMetadata().name(), beforeMoveGen, beforeMoveGen + 1)).build()).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(String source, Exception e) { | ||
| csUpdateFuture.onFailure(e); | ||
| } | ||
|
|
||
| @Override | ||
| public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) { | ||
| csUpdateFuture.onResponse(null); | ||
| } | ||
| } | ||
| ); | ||
| csUpdateFuture.get(); | ||
|
|
||
| logger.info("--> full cluster restart"); | ||
| internalCluster().fullRestart(); | ||
| ensureGreen(); | ||
|
|
||
| Repository repositoryAfterRestart = internalCluster().getCurrentMasterNodeInstance(RepositoriesService.class).repository(repoName); | ||
|
|
||
| logger.info("--> verify index-N blob is found at the new location"); | ||
| assertThat(getRepositoryData(repositoryAfterRestart).getGenId(), is(beforeMoveGen + 1)); | ||
|
|
||
| logger.info("--> delete snapshot"); | ||
| client().admin().cluster().prepareDeleteSnapshot(repoName, snapshot).get(); | ||
|
|
||
| logger.info("--> verify index-N blob is found at the expected location"); | ||
| assertThat(getRepositoryData(repositoryAfterRestart).getGenId(), is(beforeMoveGen + 2)); | ||
|
|
||
| logger.info("--> make sure snapshot doesn't exist"); | ||
| expectThrows(SnapshotMissingException.class, () -> client().admin().cluster().prepareGetSnapshots(repoName) | ||
| .addSnapshots(snapshot).get().getSnapshots(repoName)); | ||
| } | ||
|
|
||
| private void assertRepositoryBlocked(Client client, String repo, String existingSnapshot) { | ||
| logger.info("--> try to delete snapshot"); | ||
| final RepositoryException repositoryException3 = expectThrows(RepositoryException.class, | ||
| () -> client.admin().cluster().prepareDeleteSnapshot(repo, existingSnapshot).execute().actionGet()); | ||
| assertThat(repositoryException3.getMessage(), | ||
| containsString("Could not read repository data because the contents of the repository do not match its expected state.")); | ||
|
|
||
| logger.info("--> try to create snapshot"); | ||
| final RepositoryException repositoryException4 = expectThrows(RepositoryException.class, | ||
| () -> client.admin().cluster().prepareCreateSnapshot(repo, existingSnapshot).execute().actionGet()); | ||
| assertThat(repositoryException4.getMessage(), | ||
| containsString("Could not read repository data because the contents of the repository do not match its expected state.")); | ||
| } | ||
| } |
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't reuse the repo across tests that clear out its content any longer