Handle error in concurrent downsample actions (#122251)

This commit is contained in:
Kostas Krikellas 2025-02-12 15:07:38 +02:00 committed by GitHub
parent ec7f4ccb04
commit 65f6b44b2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions

View file

@ -360,9 +360,6 @@ tests:
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT - class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
method: test {yaml=snapshot.delete/10_basic/Delete a snapshot asynchronously} method: test {yaml=snapshot.delete/10_basic/Delete a snapshot asynchronously}
issue: https://github.com/elastic/elasticsearch/issues/122102 issue: https://github.com/elastic/elasticsearch/issues/122102
- class: org.elasticsearch.xpack.downsample.DownsampleActionSingleNodeTests
method: testDuplicateDownsampleRequest
issue: https://github.com/elastic/elasticsearch/issues/122158
- class: org.elasticsearch.search.SearchCancellationIT - class: org.elasticsearch.search.SearchCancellationIT
method: testCancelFailedSearchWhenPartialResultDisallowed method: testCancelFailedSearchWhenPartialResultDisallowed
issue: https://github.com/elastic/elasticsearch/issues/121719 issue: https://github.com/elastic/elasticsearch/issues/121719

View file

@ -1760,7 +1760,7 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase {
new Thread(() -> { new Thread(() -> {
try { try {
downsample(sourceIndex, targetIndex, config); downsample(sourceIndex, targetIndex, config);
} catch (ResourceAlreadyExistsException e) { } catch (ElasticsearchException e) {
firstFailed.set(true); firstFailed.set(true);
} finally { } finally {
downsampleComplete.countDown(); downsampleComplete.countDown();
@ -1770,7 +1770,7 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase {
new Thread(() -> { new Thread(() -> {
try { try {
downsample(sourceIndex, targetIndex, config); downsample(sourceIndex, targetIndex, config);
} catch (ResourceAlreadyExistsException e) { } catch (ElasticsearchException e) {
secondFailed.set(true); secondFailed.set(true);
} finally { } finally {
downsampleComplete.countDown(); downsampleComplete.countDown();