64
64
import java .util .List ;
65
65
import java .util .concurrent .ExecutionException ;
66
66
67
- import static org .opensearch .remotestore .RemoteStoreBaseIntegTestCase .remoteStoreClusterSettings ;
68
67
import static org .opensearch .test .hamcrest .OpenSearchAssertions .assertAcked ;
69
68
import static org .hamcrest .Matchers .containsString ;
70
69
import static org .hamcrest .Matchers .hasSize ;
@@ -127,7 +126,7 @@ public void testShardClone() throws Exception {
127
126
}
128
127
129
128
public void testCloneSnapshotIndex () throws Exception {
130
- internalCluster ().startClusterManagerOnlyNode ();
129
+ internalCluster ().startClusterManagerOnlyNode (LARGE_SNAPSHOT_POOL_SETTINGS );
131
130
internalCluster ().startDataOnlyNode ();
132
131
final String repoName = "repo-name" ;
133
132
createRepository (repoName , "fs" );
@@ -318,7 +317,7 @@ public void testClonePreventsSnapshotDelete() throws Exception {
318
317
indexRandomDocs (indexName , randomIntBetween (20 , 100 ));
319
318
320
319
final String targetSnapshot = "target-snapshot" ;
321
- blockNodeOnAnyFiles (repoName , clusterManagerName );
320
+ blockClusterManagerOnWriteIndexFile (repoName );
322
321
final ActionFuture <AcknowledgedResponse > cloneFuture = startClone (repoName , sourceSnapshot , targetSnapshot , indexName );
323
322
waitForBlock (clusterManagerName , repoName , TimeValue .timeValueSeconds (30L ));
324
323
assertFalse (cloneFuture .isDone ());
@@ -426,7 +425,7 @@ public void testLongRunningSnapshotAllowsConcurrentClone() throws Exception {
426
425
}
427
426
428
427
public void testDeletePreventsClone () throws Exception {
429
- final String clusterManagerName = internalCluster ().startClusterManagerOnlyNode ();
428
+ final String clusterManagerName = internalCluster ().startClusterManagerOnlyNode (LARGE_SNAPSHOT_POOL_SETTINGS );
430
429
internalCluster ().startDataOnlyNode ();
431
430
final String repoName = "repo-name" ;
432
431
createRepository (repoName , "mock" );
@@ -439,7 +438,7 @@ public void testDeletePreventsClone() throws Exception {
439
438
indexRandomDocs (indexName , randomIntBetween (20 , 100 ));
440
439
441
440
final String targetSnapshot = "target-snapshot" ;
442
- blockNodeOnAnyFiles (repoName , clusterManagerName );
441
+ blockClusterManagerOnWriteIndexFile (repoName );
443
442
final ActionFuture <AcknowledgedResponse > deleteFuture = startDeleteSnapshot (repoName , sourceSnapshot );
444
443
waitForBlock (clusterManagerName , repoName , TimeValue .timeValueSeconds (30L ));
445
444
assertFalse (deleteFuture .isDone ());
@@ -591,7 +590,7 @@ public void testClusterManagerFailoverDuringCloneStep2() throws Exception {
591
590
592
591
public void testExceptionDuringShardClone () throws Exception {
593
592
// large snapshot pool so blocked snapshot threads from cloning don't prevent concurrent snapshot finalizations
594
- internalCluster ().startClusterManagerOnlyNodes ( 3 , LARGE_SNAPSHOT_POOL_SETTINGS );
593
+ internalCluster ().startClusterManagerOnlyNode ( LARGE_SNAPSHOT_POOL_SETTINGS );
595
594
internalCluster ().startDataOnlyNode ();
596
595
final String repoName = "test-repo" ;
597
596
createRepository (repoName , "mock" );
@@ -602,7 +601,7 @@ public void testExceptionDuringShardClone() throws Exception {
602
601
createFullSnapshot (repoName , sourceSnapshot );
603
602
604
603
final String targetSnapshot = "target-snapshot" ;
605
- blockClusterManagerFromFinalizingSnapshotOnSnapFile (repoName );
604
+ blockClusterManagerFromFinalizingSnapshotOnIndexFile (repoName );
606
605
final ActionFuture <AcknowledgedResponse > cloneFuture = startCloneFromDataNode (repoName , sourceSnapshot , targetSnapshot , testIndex );
607
606
awaitNumberOfSnapshotsInProgress (1 );
608
607
final String clusterManagerNode = internalCluster ().getClusterManagerName ();
@@ -680,7 +679,7 @@ public void testStartSnapshotWithSuccessfulShardClonePendingFinalization() throw
680
679
}
681
680
682
681
public void testStartCloneWithSuccessfulShardClonePendingFinalization () throws Exception {
683
- final String clusterManagerName = internalCluster ().startClusterManagerOnlyNode ();
682
+ final String clusterManagerName = internalCluster ().startClusterManagerOnlyNode (LARGE_SNAPSHOT_POOL_SETTINGS );
684
683
internalCluster ().startDataOnlyNode ();
685
684
final String repoName = "test-repo" ;
686
685
createRepository (repoName , "mock" );
0 commit comments