From 49d8c3492d53506ab43f50b00029e8e1ef4bc7a5 Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Sat, 5 Jul 2025 12:34:47 -0300 Subject: [PATCH 1/2] Specify master timeout when submitting alias tasks We specify the master node timeout from the REST request to avoid waiting for the task indefinitely. Resolves #120389 --- .../cluster/metadata/MetadataIndexAliasesService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); } /** From ac9f7fbd37b1070a9ca8dd616ec837fa0f455dbc Mon Sep 17 00:00:00 2001 From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:06:15 -0300 Subject: [PATCH 2/2] Update docs/changelog/130733.yaml --- docs/changelog/130733.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/changelog/130733.yaml 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