Merge branch 'main' into handle-empty-chunked-infer-input

Author: jimczi

muted-tests.yml

@@ -445,9 +445,6 @@ tests:
 - class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
   method: test {p0=search/160_exists_query/Test exists query on object field in empty index}
   issue: https://github.com/elastic/elasticsearch/issues/138733
-- class: org.elasticsearch.repositories.blobstore.testkit.analyze.S3RepositoryAnalysisStrongMpusRestIT
-  method: testRepositoryAnalysis
-  issue: https://github.com/elastic/elasticsearch/issues/138762
 - class: org.elasticsearch.xpack.inference.integration.AuthorizationTaskExecutorIT
   method: testCreatesEisChatCompletionEndpoint
   issue: https://github.com/elastic/elasticsearch/issues/138764

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

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.core.Booleans;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 
@@ -26,11 +27,14 @@
 import static org.hamcrest.Matchers.not;
 
 public abstract class AbstractS3RepositoryAnalysisRestTestCase extends AbstractRepositoryAnalysisRestTestCase {
+
+    static final boolean USE_FIXTURE = Booleans.parseBoolean(System.getProperty("tests.use.fixture", "true"));
+
     protected static final Supplier<String> regionSupplier = new DynamicRegionSupplier();
 
     protected static class RepositoryAnalysisHttpFixture extends S3HttpFixture {
-        RepositoryAnalysisHttpFixture(boolean enabled) {
-            super(enabled, "bucket", "base_path_integration_tests", fixedAccessKey("s3_test_access_key", regionSupplier, "s3"));
+        RepositoryAnalysisHttpFixture() {
+            super(USE_FIXTURE, "bucket", "base_path_integration_tests", fixedAccessKey("s3_test_access_key", regionSupplier, "s3"));
         }
 
         private volatile boolean repoAnalysisStarted;
@@ -70,16 +74,16 @@ private void ensurePurposeParameterPresent(S3HttpHandler.S3Request request) {
 
     protected static final String CLIENT_NAME = "repo_test_kit";
 
-    protected static ElasticsearchCluster buildCluster(S3HttpFixture s3HttpFixture, boolean enabled) {
+    protected static ElasticsearchCluster buildCluster(S3HttpFixture s3HttpFixture) {
         final var clientPrefix = "s3.client." + CLIENT_NAME + ".";
         return ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .keystore(clientPrefix + "access_key", System.getProperty("s3AccessKey"))
             .keystore(clientPrefix + "secret_key", System.getProperty("s3SecretKey"))
-            .setting(clientPrefix + "protocol", () -> "http", (n) -> enabled)
-            .setting(clientPrefix + "region", regionSupplier, (n) -> enabled)
+            .setting(clientPrefix + "protocol", () -> "http", n -> USE_FIXTURE)
+            .setting(clientPrefix + "region", regionSupplier, n -> USE_FIXTURE)
             .setting(clientPrefix + "add_purpose_custom_query_parameter", () -> randomFrom("true", "false"), n -> randomBoolean())
-            .setting(clientPrefix + "endpoint", s3HttpFixture::getAddress, (n) -> enabled)
+            .setting(clientPrefix + "endpoint", s3HttpFixture::getAddress, n -> USE_FIXTURE)
             .setting(
                 "repository_s3.compare_and_exchange.anti_contention_delay",
                 () -> randomFrom("1s" /* == default */, "1ms"),

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

@@ -8,19 +8,16 @@
 
 import fixture.s3.S3HttpFixture;
 
-import org.elasticsearch.core.Booleans;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 
 public class S3RepositoryAnalysisRestIT extends AbstractS3RepositoryAnalysisRestTestCase {
 
-    static final boolean USE_FIXTURE = Booleans.parseBoolean(System.getProperty("tests.use.fixture", "true"));
+    public static final S3HttpFixture s3Fixture = new RepositoryAnalysisHttpFixture();
 
-    public static final S3HttpFixture s3Fixture = new RepositoryAnalysisHttpFixture(USE_FIXTURE);
-
-    public static final ElasticsearchCluster cluster = buildCluster(s3Fixture, USE_FIXTURE);
+    public static final ElasticsearchCluster cluster = buildCluster(s3Fixture);
 
     @ClassRule
     public static TestRule ruleChain = RuleChain.outerRule(s3Fixture).around(cluster);

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

@@ -17,14 +17,14 @@
 
 public class S3RepositoryAnalysisStrongMpusRestIT extends AbstractS3RepositoryAnalysisRestTestCase {
 
-    public static final S3HttpFixture s3Fixture = new RepositoryAnalysisHttpFixture(true) {
+    public static final S3HttpFixture s3Fixture = new RepositoryAnalysisHttpFixture() {
         @Override
         protected S3ConsistencyModel consistencyModel() {
             return S3ConsistencyModel.STRONG_MPUS;
         }
     };
 
-    public static final ElasticsearchCluster cluster = buildCluster(s3Fixture, true);
+    public static final ElasticsearchCluster cluster = buildCluster(s3Fixture);
 
     @ClassRule
     public static TestRule ruleChain = RuleChain.outerRule(s3Fixture).around(cluster);
@@ -34,4 +34,10 @@ protected String getTestRestCluster() {
         return cluster.getHttpAddresses();
     }
 
+    @Override
+    public void testRepositoryAnalysis() throws Exception {
+        if (USE_FIXTURE) {
+            super.testRepositoryAnalysis();
+        } // else we're running against a real AWS S3 which has a different consistency model, so this test isn't meaningful
+    }
 }