Skip to content

Commit e92d3ce

Browse files
committed
fixing the test after rebase
1 parent 615008f commit e92d3ce

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

server/src/internalClusterTest/java/org/opensearch/gateway/remote/RemoteRepositoryConfigurationIT.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.opensearch.remotemigration.MigrationBaseTestCase;
1515
import org.opensearch.remotestore.multipart.mocks.MockFsRepositoryPlugin;
1616
import org.opensearch.repositories.blobstore.BlobStoreRepository;
17+
import org.opensearch.repositories.fs.FsRepository;
1718
import org.opensearch.repositories.fs.ReloadableFsRepository;
1819
import org.opensearch.test.InternalSettingsPlugin;
1920
import org.opensearch.test.OpenSearchIntegTestCase;
@@ -115,7 +116,7 @@ public Settings.Builder remoteWithRoutingTableNodeSetting() {
115116
segmentRepoPath,
116117
REPOSITORY_2_NAME,
117118
translogRepoPath,
118-
REPOSITORY_NAME,
119+
ROUTING_TABLE_REPO_NAME,
119120
segmentRepoPath,
120121
false
121122
)
@@ -186,6 +187,7 @@ public void testRemoteNodeWithRoutingTableJoinRemoteCluster() throws Exception {
186187
internalCluster().startDataOnlyNodes(2);
187188
setAddRemote(false);
188189

190+
189191
ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
190192
updateSettingsRequest.persistentSettings(
191193
Settings.builder()
@@ -196,6 +198,7 @@ public void testRemoteNodeWithRoutingTableJoinRemoteCluster() throws Exception {
196198

197199
// Remote Repo with Routing table
198200
Settings settings = remoteWithRoutingTableNodeSetting().build();
201+
199202
internalCluster().startClusterManagerOnlyNode(settings);
200203
ensureStableCluster(4);
201204
ensureGreen();
@@ -285,10 +288,13 @@ public void testRemoteNodeWithRoutingTableJoiningPublishConfigCluster() throws E
285288
buildRemoteStoreNodeAttributes(
286289
REPOSITORY_NAME,
287290
segmentRepoPath,
291+
ReloadableFsRepository.TYPE,
288292
REPOSITORY_2_NAME,
289293
translogRepoPath,
294+
FsRepository.TYPE,
290295
ROUTING_TABLE_REPO_NAME,
291296
segmentRepoPath,
297+
ReloadableFsRepository.TYPE,
292298
false
293299
)
294300
)

test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2838,7 +2838,7 @@ private static Settings buildRemoteStoreNodeAttributes(
28382838
);
28392839
}
28402840

2841-
private static Settings buildRemoteStoreNodeAttributes(
2841+
protected static Settings buildRemoteStoreNodeAttributes(
28422842
String segmentRepoName,
28432843
Path segmentRepoPath,
28442844
String segmentRepoType,

0 commit comments

Comments
 (0)