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.
elastic · May 9, 2018 · 56ebdba · 56ebdba
1 parent f1658ff
commit 56ebdba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...a/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/...a/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/...er/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/...er/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
@@ -84,11 +84,7 @@ protected final void doExecute(Request request, ActionListener<Response> 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<ShardRequest> {
 
         @Override
         public void messageReceived(ShardRequest request, TransportChannel channel, Task task) throws Exception {
-            channel.sendResponse(shardOperation(request));
+            channel.sendResponse(shardOperation(request, task));
         }
 
         @Override