fixing tests

Signed-off-by: Gaurav Bafna <[email protected]>
opensearch-project · Jan 25, 2024 · a1357cf · a1357cf
1 parent f35c8e5
commit a1357cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java
@@ -19,6 +19,7 @@
 import org.opensearch.core.common.unit.ByteSizeUnit;
 import org.opensearch.repositories.RepositoriesService;
 import org.opensearch.repositories.Repository;
+import org.opensearch.repositories.fs.ReloadableFsRepository;
 import org.opensearch.test.InternalTestCluster;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
@@ -31,10 +32,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static org.hamcrest.Matchers.greaterThan;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
-import static org.hamcrest.Matchers.greaterThan;
 
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 0)
 public class RemoteStoreRestoreIT extends BaseRemoteStoreRestoreIT {
@@ -426,7 +427,7 @@ public void testRateLimitedRemoteDownloads() throws Exception {
         settingsMap.entrySet().forEach(entry -> settings.put(entry.getKey(), entry.getValue()));
         settings.put("location", segmentRepoPath).put("max_remote_download_bytes_per_sec", 4, ByteSizeUnit.KB);
 
-        assertAcked(client().admin().cluster().preparePutRepository(REPOSITORY_NAME).setType("fs").setSettings(settings).get());
+        assertAcked(client().admin().cluster().preparePutRepository(REPOSITORY_NAME).setType(ReloadableFsRepository.TYPE).setSettings(settings).get());
 
         for (RepositoriesService repositoriesService : internalCluster().getDataNodeInstances(RepositoriesService.class)) {
             Repository segmentRepo = repositoriesService.repository(REPOSITORY_NAME);
@@ -455,7 +456,7 @@ public void testRateLimitedRemoteDownloads() throws Exception {
         // revert repo metadata to pass asserts on repo metadata vs. node attrs during teardown
         // https://github.com/opensearch-project/OpenSearch/pull/9569#discussion_r1345668700
         settings.remove("max_remote_download_bytes_per_sec");
-        assertAcked(client().admin().cluster().preparePutRepository(REPOSITORY_NAME).setType("fs").setSettings(settings).get());
+        assertAcked(client().admin().cluster().preparePutRepository(REPOSITORY_NAME).setType(ReloadableFsRepository.TYPE).setSettings(settings).get());
         for (RepositoriesService repositoriesService : internalCluster().getDataNodeInstances(RepositoriesService.class)) {
             Repository segmentRepo = repositoriesService.repository(REPOSITORY_NAME);
             assertNull(segmentRepo.getMetadata().settings().get("max_remote_download_bytes_per_sec"));

diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SystemRepositoryIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SystemRepositoryIT.java
@@ -8,13 +8,13 @@
 
 package org.opensearch.snapshots;
 
+import org.junit.Before;
 import org.opensearch.client.Client;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.repositories.RepositoryException;
-import org.opensearch.repositories.fs.FsRepository;
+import org.opensearch.repositories.fs.ReloadableFsRepository;
 import org.opensearch.test.OpenSearchIntegTestCase;
-import org.junit.Before;
 
 import java.nio.file.Path;
 
@@ -53,7 +53,7 @@ public void testRestrictedSettingsCantBeUpdated() {
         assertEquals(
             e.getMessage(),
             "[system-repo-name] trying to modify an unmodifiable attribute type of system "
-                + "repository from current value [fs] to new value [mock]"
+                + "repository from current value [reloadable-fs] to new value [mock]"
         );
     }
 
@@ -65,7 +65,7 @@ public void testSystemRepositoryNonRestrictedSettingsCanBeUpdated() {
         final Settings.Builder repoSettings = Settings.builder().put("location", absolutePath).put("chunk_size", new ByteSizeValue(20));
 
         assertAcked(
-            client.admin().cluster().preparePutRepository(systemRepoName).setType(FsRepository.TYPE).setSettings(repoSettings).get()
+            client.admin().cluster().preparePutRepository(systemRepoName).setType(ReloadableFsRepository.TYPE).setSettings(repoSettings).get()
         );
     }
 }