From 444dfd9dd3dccccfb270fca137e66f30d35bb1d4 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 12 Jun 2025 16:02:31 +0100 Subject: [PATCH] Revert MinIO tests to `RELEASE.2024-12-18T13-15-44Z` (#129337) This reverses the upgrade in #128424, except it puts the workaround in the correct test suite and leaves several comments in place. Relates https://github.com/minio/minio/issues/21377 Closes #129127 Closes #129157 --- .../elasticsearch/test/fixtures/minio/MinioTestContainer.java | 3 ++- .../testkit/analyze/MinioRepositoryAnalysisRestIT.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java b/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java index 27baa72f027e4..15003786b65ad 100644 --- a/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java +++ b/test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java @@ -16,7 +16,8 @@ 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"; + // However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround + public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z"; private static final int servicePort = 9000; private final boolean enabled; diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java b/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java index 0929561909963..b7dc2541f42c5 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java @@ -33,6 +33,10 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes .keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key") .setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress) .setting("xpack.security.enabled", "false") + // 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.compare_and_exchange.time_to_live", "-1") + .setting("repository_s3.compare_and_exchange.anti_contention_delay", "100ms") .setting("xpack.ml.enabled", "false") .build();