diff --git a/docs/changelog/130733.yaml b/docs/changelog/130733.yaml new file mode 100644 index 0000000000000..9465f820ed1d0 --- /dev/null +++ b/docs/changelog/130733.yaml @@ -0,0 +1,6 @@ +pr: 130733 +summary: Specify master timeout when submitting alias tasks +area: Indices APIs +type: bug +issues: + - 120389 diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java index 5bb0aa4e73434..dc791fe0763d5 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java @@ -92,7 +92,7 @@ public void indicesAliases( final IndicesAliasesClusterStateUpdateRequest request, final ActionListener listener ) { - taskQueue.submitTask("index-aliases", new ApplyAliasesTask(request, listener), null); // TODO use request.masterNodeTimeout() here? + taskQueue.submitTask("index-aliases", new ApplyAliasesTask(request, listener), request.masterNodeTimeout()); } /**