Skip to content

[8.19] Upgrade MinIO test container (#128424) #128491

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 1 commit into from
May 27, 2025
Merged

[8.19] Upgrade MinIO test container (#128424) #128491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions ...tTest/java/org/elasticsearch/repositories/s3/RepositoryS3MinioBasicCredentialsRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@

import java.util.Locale;

import static org.elasticsearch.repositories.s3.S3Service.REPOSITORY_S3_CAS_ANTI_CONTENTION_DELAY_SETTING;
import static org.elasticsearch.repositories.s3.S3Service.REPOSITORY_S3_CAS_TTL_SETTING;

@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
@ThreadLeakScope(ThreadLeakScope.Scope.NONE) // https://github.com/elastic/elasticsearch/issues/102482
public class RepositoryS3MinioBasicCredentialsRestIT extends AbstractRepositoryS3RestTestCase {
Expand All @@ -42,10 +39,6 @@ public class RepositoryS3MinioBasicCredentialsRestIT extends AbstractRepositoryS
.keystore("s3.client." + CLIENT + ".access_key", ACCESS_KEY)
.keystore("s3.client." + CLIENT + ".secret_key", SECRET_KEY)
.setting("s3.client." + CLIENT + ".endpoint", minioFixture::getAddress)
// Skip listing of pre-existing uploads during a CAS because MinIO sometimes leaks them; also reduce the delay before proceeding
// TODO do not set these if running a MinIO version in which https://github.com/minio/minio/issues/21189 is fixed
.setting(REPOSITORY_S3_CAS_TTL_SETTING.getKey(), "-1")
.setting(REPOSITORY_S3_CAS_ANTI_CONTENTION_DELAY_SETTING.getKey(), "100ms")
.build();

@ClassRule
Expand Down
4 changes: 3 additions & 1 deletion ...minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@

public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {

// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-05-24T17-08-30Z";

private static final int servicePort = 9000;
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
private final boolean enabled;

/**
Expand Down
2 changes: 0 additions & 2 deletions ...g/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
.distribution(DistributionType.DEFAULT)
.keystore("s3.client.repository_test_kit.access_key", "s3_test_access_key")
.keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key")
.setting("s3.client.repository_test_kit.protocol", () -> "http")
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
.setting("xpack.security.enabled", "false")
// Additional tracing related to investigation into https://github.com/elastic/elasticsearch/issues/102294
.setting("xpack.ml.enabled", "false")
.build();

Expand Down