Skip to content

Commit 65f6b44

Browse files
authored
Handle error in concurrent downsample actions (#122251)
1 parent ec7f4cc commit 65f6b44

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,6 @@ tests:
360360
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
361361
method: test {yaml=snapshot.delete/10_basic/Delete a snapshot asynchronously}
362362
issue: https://github.com/elastic/elasticsearch/issues/122102
363-
- class: org.elasticsearch.xpack.downsample.DownsampleActionSingleNodeTests
364-
method: testDuplicateDownsampleRequest
365-
issue: https://github.com/elastic/elasticsearch/issues/122158
366363
- class: org.elasticsearch.search.SearchCancellationIT
367364
method: testCancelFailedSearchWhenPartialResultDisallowed
368365
issue: https://github.com/elastic/elasticsearch/issues/121719

x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@ public void testDuplicateDownsampleRequest() throws Exception {
17601760
new Thread(() -> {
17611761
try {
17621762
downsample(sourceIndex, targetIndex, config);
1763-
} catch (ResourceAlreadyExistsException e) {
1763+
} catch (ElasticsearchException e) {
17641764
firstFailed.set(true);
17651765
} finally {
17661766
downsampleComplete.countDown();
@@ -1770,7 +1770,7 @@ public void testDuplicateDownsampleRequest() throws Exception {
17701770
new Thread(() -> {
17711771
try {
17721772
downsample(sourceIndex, targetIndex, config);
1773-
} catch (ResourceAlreadyExistsException e) {
1773+
} catch (ElasticsearchException e) {
17741774
secondFailed.set(true);
17751775
} finally {
17761776
downsampleComplete.countDown();

0 commit comments

Comments
 (0)