(camel) branch main updated: CAMEL-24018: Fix flaky OpensearchIndexIT (#24620)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new e95c60e2febb CAMEL-24018: Fix flaky OpensearchIndexIT (#24620)
e95c60e2febb is described below

commit e95c60e2febb46394ddf223931440e77f24c9fab
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sun Jul 12 22:05:25 2026 +0200

    CAMEL-24018: Fix flaky OpensearchIndexIT (#24620)
    
    CAMEL-24018: Fix flaky OpensearchIndexIT
    
    Co-authored-by: Claude Opus 4.6 <nore...@anthropic.com>
---
 .../component/opensearch/integration/OpensearchIndexIT.java   | 11 +++++++++++
 .../services/OpenSearchLocalContainerInfraService.java        |  4 ++++
 2 files changed, 15 insertions(+)

diff --git 
a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchIndexIT.java
 
b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchIndexIT.java
index 469377f977c5..bd78acdb8444 100644
--- 
a/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchIndexIT.java
+++ 
b/components/camel-opensearch/src/test/java/org/apache/camel/component/opensearch/integration/OpensearchIndexIT.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.component.opensearch.integration;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.opensearch.OpensearchConstants;
 import org.apache.camel.component.opensearch.OpensearchOperation;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.opensearch.client.opensearch.indices.DeleteIndexRequest;
 
@@ -32,6 +34,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OpensearchIndexIT extends OpensearchTestSupport {
 
+    @AfterEach
+    void cleanupIndex() throws IOException {
+        try {
+            client.indices().delete(new 
DeleteIndexRequest.Builder().index("twitter").build());
+        } catch (Exception e) {
+            // index may not exist, ignore
+        }
+    }
+
     @Test
     void testIndex() {
         Map<String, String> map = createIndexedData();
diff --git 
a/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerInfraService.java
 
b/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerInfraService.java
index acf0c28f1de2..577ad23abbd3 100644
--- 
a/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerInfraService.java
+++ 
b/test-infra/camel-test-infra-opensearch/src/main/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerInfraService.java
@@ -70,6 +70,10 @@ public class OpenSearchLocalContainerInfraService implements 
OpenSearchInfraServ
                 withEnv("OPENSEARCH_JAVA_OPTS",
                         "-Dopensearch.cgroups.hierarchy.override=/ 
-Dopensearch.plugin.disable=opensearch-observability");
 
+                // Disable disk watermarks to prevent "disk usage exceeded 
flood-stage watermark"
+                // errors when running on CI machines with limited disk space 
(CAMEL-24018)
+                withEnv("cluster.routing.allocation.disk.threshold_enabled", 
"false");
+
                 ContainerEnvironmentUtil.configurePort(this, fixedPort, 
OPEN_SEARCH_PORT);
             }
         }