From b904c360368facdc5407d888aa9b24385fbf003b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Campinas?= Date: Mon, 7 May 2018 12:47:31 +0100 Subject: [PATCH] Pass the task to broadcast actions (#29672) Since the task is required as per line 292, give the opportunity to broadcast actions to handle tasks. --- .../validate/query/TransportValidateQueryAction.java | 2 +- .../support/broadcast/TransportBroadcastAction.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java index 5be321734b5db..c90a7428268cd 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java @@ -184,7 +184,7 @@ protected ValidateQueryResponse newResponse(ValidateQueryRequest request, Atomic } @Override - protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request) throws IOException { + protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request, Task task) throws IOException { boolean valid; String explanation = null; String error = null; diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java index 0961ab74c4703..60eaa19eaff63 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java @@ -84,11 +84,7 @@ protected final void doExecute(Request request, ActionListener listene protected abstract ShardResponse newShardResponse(); - protected abstract ShardResponse shardOperation(ShardRequest request) throws IOException; - - protected ShardResponse shardOperation(ShardRequest request, Task task) throws IOException { - return shardOperation(request); - } + protected abstract ShardResponse shardOperation(ShardRequest request, Task task) throws IOException; /** * Determines the shards this operation will be executed on. The operation is executed once per shard iterator, typically @@ -284,7 +280,7 @@ class ShardTransportHandler implements TransportRequestHandler { @Override public void messageReceived(ShardRequest request, TransportChannel channel, Task task) throws Exception { - channel.sendResponse(shardOperation(request)); + channel.sendResponse(shardOperation(request, task)); } @Override