Skip to content

Commit 46955ff

Browse files
authored
Fix flaky RepositoriesServiceIT.testCreatSnapAndUpdateReposityCauseInfiniteLoop (opensearch-project#18199)
Signed-off-by: kkewwei <kewei.11@bytedance.com> Signed-off-by: kkewwei <kkewwei@163.com>
1 parent 4ce638c commit 46955ff

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

server/src/internalClusterTest/java/org/opensearch/repositories/RepositoriesServiceIT.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public void testSystemRepositoryCantBeCreated() {
127127
assertThrows(RepositoryException.class, () -> createRepository(repositoryName, FsRepository.TYPE, repoSettings));
128128
}
129129

130-
@AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/15842")
131130
public void testCreatSnapAndUpdateReposityCauseInfiniteLoop() throws InterruptedException {
132131
// create index
133132
internalCluster();
@@ -173,16 +172,20 @@ public void testCreatSnapAndUpdateReposityCauseInfiniteLoop() throws Interrupted
173172
});
174173
thread.start();
175174

176-
logger.info("--> begin to reset repository");
177-
repoSettings = Settings.builder().put("location", randomRepoPath()).put("max_snapshot_bytes_per_sec", "300mb");
178-
OpenSearchIntegTestCase.putRepositoryWithNoSettingOverrides(
179-
client().admin().cluster(),
180-
repositoryName,
181-
FsRepository.TYPE,
182-
true,
183-
repoSettings
184-
);
185-
logger.info("--> finish to reset repository");
175+
try {
176+
logger.info("--> begin to reset repository");
177+
repoSettings = Settings.builder().put("location", randomRepoPath()).put("max_snapshot_bytes_per_sec", "300mb");
178+
OpenSearchIntegTestCase.putRepositoryWithNoSettingOverrides(
179+
client().admin().cluster(),
180+
repositoryName,
181+
FsRepository.TYPE,
182+
true,
183+
repoSettings
184+
);
185+
logger.info("--> finish to reset repository");
186+
} catch (IllegalStateException e) {
187+
assertThat(e, hasToString(containsString(("trying to modify or unregister repository that is currently used"))));
188+
}
186189

187190
// after updating repository, snapshot should be success
188191
createSnapshot.run();

0 commit comments

Comments
 (0)