-
Notifications
You must be signed in to change notification settings - Fork 25.2k
Prevent CCR recovery from missing documents #38472
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6c123b3
Prevent CCR recovery from missing documents (#38237)
Tim-Brooks ad96290
Fix
Tim-Brooks f5c98e0
Merge remote-tracking branch 'upstream/6.7' into backport_missing_ops
Tim-Brooks 9e1bb5b
Changes
Tim-Brooks e32da3d
WIP
Tim-Brooks b38361f
Fix test
Tim-Brooks 8ec1542
Change
Tim-Brooks 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 hidden or 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 hidden or 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 hidden or 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
146 changes: 146 additions & 0 deletions
146
test/framework/src/main/java/org/elasticsearch/index/shard/RestoreOnlyRepository.java
This file contains hidden or 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,146 @@ | ||
| /* | ||
| * 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.index.shard; | ||
|
|
||
| import org.apache.lucene.index.IndexCommit; | ||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.cluster.metadata.MetaData; | ||
| import org.elasticsearch.cluster.metadata.RepositoryMetaData; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.component.AbstractLifecycleComponent; | ||
| import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; | ||
| import org.elasticsearch.index.store.Store; | ||
| import org.elasticsearch.repositories.IndexId; | ||
| import org.elasticsearch.repositories.Repository; | ||
| import org.elasticsearch.repositories.RepositoryData; | ||
| import org.elasticsearch.snapshots.SnapshotId; | ||
| import org.elasticsearch.snapshots.SnapshotInfo; | ||
| import org.elasticsearch.snapshots.SnapshotShardFailure; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import static java.util.Collections.emptySet; | ||
| import static org.elasticsearch.repositories.RepositoryData.EMPTY_REPO_GEN; | ||
|
|
||
| /** A dummy repository for testing which just needs restore overridden */ | ||
| public abstract class RestoreOnlyRepository extends AbstractLifecycleComponent implements Repository { | ||
| private final String indexName; | ||
|
|
||
| public RestoreOnlyRepository(String indexName) { | ||
| this.indexName = indexName; | ||
| } | ||
|
|
||
| @Override | ||
| protected void doStart() { | ||
| } | ||
|
|
||
| @Override | ||
| protected void doStop() { | ||
| } | ||
|
|
||
| @Override | ||
| protected void doClose() { | ||
| } | ||
|
|
||
| @Override | ||
| public RepositoryMetaData getMetadata() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public SnapshotInfo getSnapshotInfo(SnapshotId snapshotId) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public MetaData getSnapshotGlobalMetaData(SnapshotId snapshotId) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public IndexMetaData getSnapshotIndexMetaData(SnapshotId snapshotId, IndexId index) throws IOException { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public RepositoryData getRepositoryData() { | ||
| Map<IndexId, Set<SnapshotId>> map = new HashMap<>(); | ||
| map.put(new IndexId(indexName, "blah"), emptySet()); | ||
| return new RepositoryData(EMPTY_REPO_GEN, Collections.emptyMap(), Collections.emptyMap(), map, Collections.emptyList()); | ||
| } | ||
|
|
||
| @Override | ||
| public void initializeSnapshot(SnapshotId snapshotId, List<IndexId> indices, MetaData metaData) { | ||
| } | ||
|
|
||
| @Override | ||
| public SnapshotInfo finalizeSnapshot(SnapshotId snapshotId, List<IndexId> indices, long startTime, String failure, | ||
| int totalShards, List<SnapshotShardFailure> shardFailures, long repositoryStateId, | ||
| boolean includeGlobalState) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void deleteSnapshot(SnapshotId snapshotId, long repositoryStateId) { | ||
| } | ||
|
|
||
| @Override | ||
| public long getSnapshotThrottleTimeInNanos() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public long getRestoreThrottleTimeInNanos() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public String startVerification() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void endVerification(String verificationToken) { | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isReadOnly() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void snapshotShard(IndexShard shard, Store store, SnapshotId snapshotId, IndexId indexId, IndexCommit snapshotIndexCommit, | ||
| IndexShardSnapshotStatus snapshotStatus) { | ||
| } | ||
|
|
||
| @Override | ||
| public IndexShardSnapshotStatus getShardSnapshotStatus(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void verify(String verificationToken, DiscoveryNode localNode) { | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
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.
You can remove the if block and instead write the following 2 assertions: