Skip to content

Exercise multi-part uploads in S3 repo analysis tests #125669

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

Merged
merged 2 commits into from
Mar 26, 2025
Merged

Exercise multi-part uploads in S3 repo analysis tests #125669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e574efd
Exercise multi-part uploads in S3 repo analysis tests
DaveCTurner Mar 26, 2025
9c03730
Remove WIP comment
DaveCTurner Mar 26, 2025
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
2 changes: 2 additions & 0 deletions .../org/elasticsearch/repositories/blobstore/testkit/analyze/S3RepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import fixture.s3.S3HttpFixture;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.junit.ClassRule;
Expand Down Expand Up @@ -59,6 +60,7 @@ protected Settings repositorySettings() {
.put("bucket", bucket)
.put("base_path", basePath)
.put("delete_objects_max_size", between(1, 1000))
.put("buffer_size", ByteSizeValue.ofMb(5)) // so some uploads are multipart ones
.build();
}
}
2 changes: 1 addition & 1 deletion ...search/repositories/blobstore/testkit/analyze/AbstractRepositoryAnalysisRestTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void testRepositoryAnalysis() throws Exception {
final Request request = new Request(HttpPost.METHOD_NAME, "/_snapshot/" + repository + "/_analyze");
request.addParameter("blob_count", "10");
request.addParameter("concurrency", "4");
request.addParameter("max_blob_size", "1mb");
request.addParameter("max_blob_size", randomFrom("1mb", "10mb"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use actual value from the repositorySettings? Hard to guess relationship between those two.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is abstract so no we can't see anything S3-specific here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it worth increasing the range to 15 or 20? To get more than 2 chunks?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 is enough, I can't really see how we could get this right with 2 chunks but wrong with more.

request.addParameter("timeout", "120s");
request.addParameter("seed", Long.toString(randomLong()));
assertOK(client().performRequest(request));
Expand Down