Specify master timeout when submitting alias tasks (#130733)

nielsbauman · web-flow · commit bdd6f51120cf · 2025-07-08T06:09:17.000-03:00
We specify the master node timeout from the REST request to avoid waiting for the task indefinitely. Resolves #120389
diff --git a/docs/changelog/130733.yaml 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
@@ -92,7 +92,7 @@ public void indicesAliases(
         final IndicesAliasesClusterStateUpdateRequest request,
         final ActionListener<IndicesAliasesResponse> 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());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void indicesAliases(`
`92`	`92`	`final IndicesAliasesClusterStateUpdateRequest request,`
`93`	`93`	`final ActionListener<IndicesAliasesResponse> listener`
`94`	`94`	`) {`
`95`		`- taskQueue.submitTask("index-aliases", new ApplyAliasesTask(request, listener), null); // TODO use request.masterNodeTimeout() here?`
	`95`	`+ taskQueue.submitTask("index-aliases", new ApplyAliasesTask(request, listener), request.masterNodeTimeout());`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`