Skip to content

Commit 415b19e

Browse files
authored
Upgrade MinIO test container (elastic#128424) (elastic#128491)
Earlier versions of MinIO had a bug which can cause repository analysis failures. This commit upgrades the MinIO test container version to pick up the bug fix, and reverts the workaround implemented in elastic#127166. Relates minio/minio#21189
1 parent 8e59a38 commit 415b19e

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3MinioBasicCredentialsRestIT.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222
import java.util.Locale;
2323

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

5144
@ClassRule

test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {
1717

18+
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
19+
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-05-24T17-08-30Z";
20+
1821
private static final int servicePort = 9000;
19-
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
2022
private final boolean enabled;
2123

2224
/**

x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
3131
.distribution(DistributionType.DEFAULT)
3232
.keystore("s3.client.repository_test_kit.access_key", "s3_test_access_key")
3333
.keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key")
34-
.setting("s3.client.repository_test_kit.protocol", () -> "http")
3534
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
3635
.setting("xpack.security.enabled", "false")
37-
// Additional tracing related to investigation into https://github.com/elastic/elasticsearch/issues/102294
3836
.setting("xpack.ml.enabled", "false")
3937
.build();
4038

0 commit comments

Comments
 (0)