Skip to content

Commit 076e7cb

Browse files
[Snapshot V2] Support pinned timestamp in clone flow (#15524) (#15787)
(cherry picked from commit debd040) Signed-off-by: Anshu Agarwal <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 8a119fa commit 076e7cb

File tree

4 files changed

+713
-14
lines changed

4 files changed

+713
-14
lines changed

server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import java.util.List;
6565
import java.util.concurrent.ExecutionException;
6666

67-
import static org.opensearch.remotestore.RemoteStoreBaseIntegTestCase.remoteStoreClusterSettings;
6867
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
6968
import static org.hamcrest.Matchers.containsString;
7069
import static org.hamcrest.Matchers.hasSize;
@@ -145,7 +144,7 @@ public void testShardClone() throws Exception {
145144
}
146145

147146
public void testCloneSnapshotIndex() throws Exception {
148-
internalCluster().startClusterManagerOnlyNode();
147+
internalCluster().startClusterManagerOnlyNode(LARGE_SNAPSHOT_POOL_SETTINGS);
149148
internalCluster().startDataOnlyNode();
150149
final String repoName = "repo-name";
151150
createRepository(repoName, "fs");
@@ -336,7 +335,7 @@ public void testClonePreventsSnapshotDelete() throws Exception {
336335
indexRandomDocs(indexName, randomIntBetween(20, 100));
337336

338337
final String targetSnapshot = "target-snapshot";
339-
blockNodeOnAnyFiles(repoName, clusterManagerName);
338+
blockClusterManagerOnWriteIndexFile(repoName);
340339
final ActionFuture<AcknowledgedResponse> cloneFuture = startClone(repoName, sourceSnapshot, targetSnapshot, indexName);
341340
waitForBlock(clusterManagerName, repoName, TimeValue.timeValueSeconds(30L));
342341
assertFalse(cloneFuture.isDone());
@@ -444,7 +443,7 @@ public void testLongRunningSnapshotAllowsConcurrentClone() throws Exception {
444443
}
445444

446445
public void testDeletePreventsClone() throws Exception {
447-
final String clusterManagerName = internalCluster().startClusterManagerOnlyNode();
446+
final String clusterManagerName = internalCluster().startClusterManagerOnlyNode(LARGE_SNAPSHOT_POOL_SETTINGS);
448447
internalCluster().startDataOnlyNode();
449448
final String repoName = "repo-name";
450449
createRepository(repoName, "mock");
@@ -457,7 +456,7 @@ public void testDeletePreventsClone() throws Exception {
457456
indexRandomDocs(indexName, randomIntBetween(20, 100));
458457

459458
final String targetSnapshot = "target-snapshot";
460-
blockNodeOnAnyFiles(repoName, clusterManagerName);
459+
blockClusterManagerOnWriteIndexFile(repoName);
461460
final ActionFuture<AcknowledgedResponse> deleteFuture = startDeleteSnapshot(repoName, sourceSnapshot);
462461
waitForBlock(clusterManagerName, repoName, TimeValue.timeValueSeconds(30L));
463462
assertFalse(deleteFuture.isDone());
@@ -609,7 +608,7 @@ public void testClusterManagerFailoverDuringCloneStep2() throws Exception {
609608

610609
public void testExceptionDuringShardClone() throws Exception {
611610
// large snapshot pool so blocked snapshot threads from cloning don't prevent concurrent snapshot finalizations
612-
internalCluster().startClusterManagerOnlyNodes(3, LARGE_SNAPSHOT_POOL_SETTINGS);
611+
internalCluster().startClusterManagerOnlyNode(LARGE_SNAPSHOT_POOL_SETTINGS);
613612
internalCluster().startDataOnlyNode();
614613
final String repoName = "test-repo";
615614
createRepository(repoName, "mock");
@@ -620,7 +619,7 @@ public void testExceptionDuringShardClone() throws Exception {
620619
createFullSnapshot(repoName, sourceSnapshot);
621620

622621
final String targetSnapshot = "target-snapshot";
623-
blockClusterManagerFromFinalizingSnapshotOnSnapFile(repoName);
622+
blockClusterManagerFromFinalizingSnapshotOnIndexFile(repoName);
624623
final ActionFuture<AcknowledgedResponse> cloneFuture = startCloneFromDataNode(repoName, sourceSnapshot, targetSnapshot, testIndex);
625624
awaitNumberOfSnapshotsInProgress(1);
626625
final String clusterManagerNode = internalCluster().getClusterManagerName();
@@ -698,7 +697,7 @@ public void testStartSnapshotWithSuccessfulShardClonePendingFinalization() throw
698697
}
699698

700699
public void testStartCloneWithSuccessfulShardClonePendingFinalization() throws Exception {
701-
final String clusterManagerName = internalCluster().startClusterManagerOnlyNode();
700+
final String clusterManagerName = internalCluster().startClusterManagerOnlyNode(LARGE_SNAPSHOT_POOL_SETTINGS);
702701
internalCluster().startDataOnlyNode();
703702
final String repoName = "test-repo";
704703
createRepository(repoName, "mock");

0 commit comments

Comments
 (0)