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 main into multi-project

Browse source
This commit is contained in:
Niels Bauman 2025-01-24 15:47:40 +10:00
commit 6495dcbb40
287 changed files with 9134 additions and 2149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/TransportDownsampleAction.java
View file

@ -550,7 +550,7 @@ public class TransportDownsampleAction extends AcknowledgedTransportMasterNodeAc
persistentTaskId,
DownsampleShardTask.TASK_NAME,
params,
null,
TimeValue.THIRTY_SECONDS /* TODO should this be configurable? longer by default? infinite? */,
ActionListener.wrap(
startedTask -> persistentTasksService.waitForPersistentTaskCondition(
startedTask.getId(),