github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge revision 5c00341c2b into multi-project

Browse source
This commit is contained in:
Tim Vernum 2025-02-14 17:17:41 +11:00
commit 680e7a6979
315 changed files with 11381 additions and 4339 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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