honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Stéphane Campinas 2018-05-07 12:47:31 +01:00 committed by Boaz Leskes
parent 9f5fe49cec
commit 39623402fc
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
View File

@ -184,7 +184,7 @@ public class TransportValidateQueryAction extends TransportBroadcastAction<Valid
} }
@Override @Override
protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request) throws IOException { protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request, Task task) throws IOException {
boolean valid; boolean valid;
String explanation = null; String explanation = null;
String error = null; String error = null;

8
server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
View File

@ -84,11 +84,7 @@ public abstract class TransportBroadcastAction<Request extends BroadcastRequest<
protected abstract ShardResponse newShardResponse(); protected abstract ShardResponse newShardResponse();
protected abstract ShardResponse shardOperation(ShardRequest request) throws IOException; protected abstract ShardResponse shardOperation(ShardRequest request, Task task) throws IOException;
protected ShardResponse shardOperation(ShardRequest request, Task task) throws IOException {
return shardOperation(request);
}
/** /**
* Determines the shards this operation will be executed on. The operation is executed once per shard iterator, typically * Determines the shards this operation will be executed on. The operation is executed once per shard iterator, typically
@ -284,7 +280,7 @@ public abstract class TransportBroadcastAction<Request extends BroadcastRequest<
@Override @Override
public void messageReceived(ShardRequest request, TransportChannel channel, Task task) throws Exception { public void messageReceived(ShardRequest request, TransportChannel channel, Task task) throws Exception {
channel.sendResponse(shardOperation(request)); channel.sendResponse(shardOperation(request, task));
} }
@Override @Override