Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add integration tests for remote store restore flow #8484

Merged
merged 17 commits into from
Jul 20, 2023
Merged

Add integration tests for remote store restore flow #8484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4532770
WIP - debug restore failures with replicas
Jul 5, 2023
8d7eccf
Add remote store restore ITs for 1-replica config, wildcards, exclusi…
Jul 6, 2023
5571101
Mute failing tests
Jul 6, 2023
c52d157
Add restore IT for multiple shards
Jul 11, 2023
b7ec908
Fix new tests for multiple shards and selective red indices
Jul 11, 2023
48323de
Fix wildcard, verifyRestoredData
Jul 11, 2023
88e6cfb
Change index names to match different wildcards
Jul 11, 2023
525b4d2
Empty commit
Jul 12, 2023
cdcf615
Remove testRTSRestoreWithCommittedDataMultipleShards, Randomize shard…
Jul 12, 2023
48b9111
Skip flaky tests testStaleCommitDeletionWithInvokeFlush and testStale…
Jul 12, 2023
9f93f0e
Empty commit
Jul 12, 2023
6f3b206
Override expectEmptyRetentionLeases in RemoteStoreRecoverySource
Jul 19, 2023
a0e0e13
Empty commit
Jul 20, 2023
74931f6
Randomize RTS repo selection be same/different than RSS repo
Jul 20, 2023
990b160
Fix tests failing due to missing repo
Jul 20, 2023
6fde387
Add TODO to update RemoteStoreRecoverySource#expectEmptyRetentionLeas…
Jul 20, 2023
dd1968d
Pass testPrimaryTermValidation()
Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions server/src/internalClusterTest/java/org/opensearch/remotestore/PrimaryTermValidationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public void testPrimaryTermValidation() throws Exception {
assertAcked(
clusterAdmin().preparePutRepository(REPOSITORY_NAME).setType("fs").setSettings(Settings.builder().put("location", absolutePath))
);
absolutePath2 = randomRepoPath().toAbsolutePath();
putRepository(absolutePath2, REPOSITORY_2_NAME);

// Start data nodes and create index
internalCluster().startDataOnlyNodes(2, clusterSettings);
Expand Down
17 changes: 12 additions & 5 deletions ...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@

public class RemoteStoreBaseIntegTestCase extends OpenSearchIntegTestCase {
protected static final String REPOSITORY_NAME = "test-remore-store-repo";
protected static final String REPOSITORY_2_NAME = "test-remore-store-repo-2";
protected static final int SHARD_COUNT = 1;
protected static final int REPLICA_COUNT = 1;

protected Path absolutePath;
protected Path absolutePath2;

@Override
protected boolean addMockInternalEngine() {
Expand Down Expand Up @@ -95,10 +96,11 @@ protected Settings remoteStoreIndexSettings(int numberOfReplicas, long totalFiel
}

protected Settings remoteTranslogIndexSettings(int numberOfReplicas, int numberOfShards) {
boolean sameRepoForRSSAndRTS = randomBoolean();
return Settings.builder()
.put(remoteStoreIndexSettings(numberOfReplicas, numberOfShards))
.put(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_ENABLED, true)
.put(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, REPOSITORY_NAME)
.put(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, sameRepoForRSSAndRTS ? REPOSITORY_NAME : REPOSITORY_2_NAME)
.build();
}

Expand All @@ -107,20 +109,25 @@ protected Settings remoteTranslogIndexSettings(int numberOfReplicas) {
}

protected void putRepository(Path path) {
assertAcked(
clusterAdmin().preparePutRepository(REPOSITORY_NAME).setType("fs").setSettings(Settings.builder().put("location", path))
);
putRepository(path, REPOSITORY_NAME);
}

protected void putRepository(Path path, String repoName) {
assertAcked(clusterAdmin().preparePutRepository(repoName).setType("fs").setSettings(Settings.builder().put("location", path)));
}

protected void setupRepo() {
internalCluster().startClusterManagerOnlyNode();
absolutePath = randomRepoPath().toAbsolutePath();
putRepository(absolutePath);
absolutePath2 = randomRepoPath().toAbsolutePath();
putRepository(absolutePath2, REPOSITORY_2_NAME);
}

@After
public void teardown() {
assertAcked(clusterAdmin().prepareDeleteRepository(REPOSITORY_NAME));
assertAcked(clusterAdmin().prepareDeleteRepository(REPOSITORY_2_NAME));
}

public int getFileCount(Path path) throws Exception {
Expand Down
Loading