From defd16440022ed1e37a24078308d9cd9375ab3bf Mon Sep 17 00:00:00 2001
From: Kostas Krikellas <kostas.krikellas@elastic.co>
Date: Tue, 11 Feb 2025 15:21:37 +0200
Subject: [PATCH] Handle error in concurrent downsample actions

---
 muted-tests.yml                                               | 3 ---
 .../xpack/downsample/DownsampleActionSingleNodeTests.java     | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 9c8593c5e0909..608497c2a5820 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -381,9 +381,6 @@ tests:
 - class: org.elasticsearch.xpack.ml.integration.ClassificationIT
   method: testWithOnlyTrainingRowsAndTrainingPercentIsFifty_DependentVariableIsBoolean
   issue: https://github.com/elastic/elasticsearch/issues/121680
-- class: org.elasticsearch.xpack.downsample.DownsampleActionSingleNodeTests
-  method: testDuplicateDownsampleRequest
-  issue: https://github.com/elastic/elasticsearch/issues/122158
 - class: org.elasticsearch.search.SearchCancellationIT
   method: testCancelFailedSearchWhenPartialResultDisallowed
   issue: https://github.com/elastic/elasticsearch/issues/121719
diff --git a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
index ce9b60938526a..2c759f150e575 100644
--- a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
+++ b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
@@ -1760,7 +1760,7 @@ public void testDuplicateDownsampleRequest() throws Exception {
         new Thread(() -> {
             try {
                 downsample(sourceIndex, targetIndex, config);
-            } catch (ResourceAlreadyExistsException e) {
+            } catch (ElasticsearchException e) {
                 firstFailed.set(true);
             } finally {
                 downsampleComplete.countDown();
@@ -1770,7 +1770,7 @@ public void testDuplicateDownsampleRequest() throws Exception {
         new Thread(() -> {
             try {
                 downsample(sourceIndex, targetIndex, config);
-            } catch (ResourceAlreadyExistsException e) {
+            } catch (ElasticsearchException e) {
                 secondFailed.set(true);
             } finally {
                 downsampleComplete.countDown();