Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Add support to upload snapshot shard blobs with hashed prefix #15643

Merged
merged 6 commits into from
Sep 4, 2024
Merged

[Backport 2.x] Add support to upload snapshot shard blobs with hashed prefix #15643

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a16f354
Add support to upload snapshot shard blobs with hashed prefix (#15426)
ashking94 Sep 1, 2024
a09004b
Fix RepositoriesServiceIT.testUpdateRepository from #15426 (#15559)
ashking94 Sep 1, 2024
c1538a8
Fix flaky tests with hashed prefix path type snapshots (#15560)
ashking94 Sep 2, 2024
fe68304
Merge remote-tracking branch 'upstream/2.x' into 2.x-backport-15426-1…
ashking94 Sep 4, 2024
4cab651
Fix backward compatibility changes
ashking94 Sep 4, 2024
f9b49ed
Fix CorruptedBlobStoreRepositoryIT tests
ashking94 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix RepositoriesServiceIT.testUpdateRepository from #15426 (#15559) 
Signed-off-by: Ashish Singh <ssashish@amazon.com>
  • Loading branch information
@ashking94
ashking94 committed Sep 4, 2024
commit a09004b422ff58651ffb3862c2087ed3852872e8
16 changes: 14 additions & 2 deletions server/src/internalClusterTest/java/org/opensearch/repositories/RepositoriesServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ public void testUpdateRepository() {
.next();

final Settings.Builder repoSettings = Settings.builder().put("location", randomRepoPath());
createRepository(repositoryName, FsRepository.TYPE, repoSettings);
OpenSearchIntegTestCase.putRepositoryWithNoSettingOverrides(
client().admin().cluster(),
repositoryName,
FsRepository.TYPE,
true,
repoSettings
);

final GetRepositoriesResponse originalGetRepositoriesResponse = client.admin()
.cluster()
Expand All @@ -87,7 +93,13 @@ public void testUpdateRepository() {
final boolean updated = randomBoolean();
final String updatedRepositoryType = updated ? "mock" : FsRepository.TYPE;

createRepository(repositoryName, updatedRepositoryType, repoSettings);
OpenSearchIntegTestCase.putRepositoryWithNoSettingOverrides(
client().admin().cluster(),
repositoryName,
updatedRepositoryType,
true,
repoSettings
);

final GetRepositoriesResponse updatedGetRepositoriesResponse = client.admin()
.cluster()
Expand Down