From eff6654396c633834b93b5c1b748e084c1756297 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 30 Jan 2025 22:06:33 +0100 Subject: [PATCH] Update ESRestTestCase's ROLLUP_REQUESTS_OPTIONS Sometimes there are multiple warning. --- .../org/elasticsearch/test/rest/ESRestTestCase.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 5738ab60f47eb..40b2bae2fc4b1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -169,14 +169,16 @@ public abstract class ESRestTestCase extends ESTestCase { private static final String EXPECTED_ROLLUP_WARNING_MESSAGE = "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."; public static final RequestOptions.Builder ROLLUP_REQUESTS_OPTIONS = RequestOptions.DEFAULT.toBuilder().setWarningsHandler(warnings -> { - // Either no warning, because of bwc integration test OR - // the expected warning, because on current version if (warnings.isEmpty()) { return false; - } else if (warnings.size() == 1 && EXPECTED_ROLLUP_WARNING_MESSAGE.equals(warnings.get(0))) { - return false; } else { - return true; + // Sometimes multiple rollup deprecation warnings. Transport actions can be invoked multiple time on different nodes. + for (String warning : warnings) { + if (EXPECTED_ROLLUP_WARNING_MESSAGE.equals(warning) == false) { + return true; + } + } + return false; } });