|
|
@@ -47,8 +47,8 @@ public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequ
|
|
|
@Inject
|
|
|
public TransportMultiGetAction(Settings settings, ThreadPool threadPool, TransportService transportService,
|
|
|
ClusterService clusterService, TransportShardMultiGetAction shardAction,
|
|
|
- ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
|
|
|
- super(settings, MultiGetAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, MultiGetRequest::new);
|
|
|
+ ActionFilters actionFilters, IndexNameExpressionResolver resolver) {
|
|
|
+ super(settings, MultiGetAction.NAME, threadPool, transportService, actionFilters, resolver, MultiGetRequest::new);
|
|
|
this.clusterService = clusterService;
|
|
|
this.shardAction = shardAction;
|
|
|
}
|
|
|
@@ -56,36 +56,47 @@ public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequ
|
|
|
@Override
|
|
|
protected void doExecute(final MultiGetRequest request, final ActionListener<MultiGetResponse> listener) {
|
|
|
ClusterState clusterState = clusterService.state();
|
|
|
-
|
|
|
clusterState.blocks().globalBlockedRaiseException(ClusterBlockLevel.READ);
|
|
|
|
|
|
final AtomicArray<MultiGetItemResponse> responses = new AtomicArray<>(request.items.size());
|
|
|
+ final Map<ShardId, MultiGetShardRequest> shardRequests = new HashMap<>();
|
|
|
|
|
|
- Map<ShardId, MultiGetShardRequest> shardRequests = new HashMap<>();
|
|
|
for (int i = 0; i < request.items.size(); i++) {
|
|
|
MultiGetRequest.Item item = request.items.get(i);
|
|
|
+
|
|
|
if (!clusterState.metaData().hasConcreteIndex(item.index())) {
|
|
|
- responses.set(i, new MultiGetItemResponse(null, new MultiGetResponse.Failure(item.index(), item.type(), item.id(), new IndexNotFoundException(item.index()))));
|
|
|
+ responses.set(i, newItemFailure(item.index(), item.type(), item.id(), new IndexNotFoundException(item.index())));
|
|
|
continue;
|
|
|
}
|
|
|
- item.routing(clusterState.metaData().resolveIndexRouting(item.parent(), item.routing(), item.index()));
|
|
|
- String concreteSingleIndex = indexNameExpressionResolver.concreteSingleIndex(clusterState, item).getName();
|
|
|
- if (item.routing() == null && clusterState.getMetaData().routingRequired(concreteSingleIndex, item.type())) {
|
|
|
- responses.set(i, new MultiGetItemResponse(null, new MultiGetResponse.Failure(concreteSingleIndex, item.type(), item.id(),
|
|
|
- new IllegalArgumentException("routing is required for [" + concreteSingleIndex + "]/[" + item.type() + "]/[" + item.id() + "]"))));
|
|
|
+
|
|
|
+ String concreteSingleIndex;
|
|
|
+ try {
|
|
|
+ item.routing(clusterState.metaData().resolveIndexRouting(item.parent(), item.routing(), item.index()));
|
|
|
+ concreteSingleIndex = indexNameExpressionResolver.concreteSingleIndex(clusterState, item).getName();
|
|
|
+
|
|
|
+ if ((item.routing() == null) && (clusterState.getMetaData().routingRequired(concreteSingleIndex, item.type()))) {
|
|
|
+ String message = "routing is required for [" + concreteSingleIndex + "]/[" + item.type() + "]/[" + item.id() + "]";
|
|
|
+ responses.set(i, newItemFailure(concreteSingleIndex, item.type(), item.id(), new IllegalArgumentException(message)));
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ responses.set(i, newItemFailure(item.index(), item.type(), item.id(), e));
|
|
|
continue;
|
|
|
}
|
|
|
+
|
|
|
ShardId shardId = clusterService.operationRouting()
|
|
|
- .getShards(clusterState, concreteSingleIndex, item.id(), item.routing(), null).shardId();
|
|
|
+ .getShards(clusterState, concreteSingleIndex, item.id(), item.routing(), null)
|
|
|
+ .shardId();
|
|
|
+
|
|
|
MultiGetShardRequest shardRequest = shardRequests.get(shardId);
|
|
|
if (shardRequest == null) {
|
|
|
- shardRequest = new MultiGetShardRequest(request, shardId.getIndexName(), shardId.id());
|
|
|
+ shardRequest = new MultiGetShardRequest(request, shardId.getIndexName(), shardId.getId());
|
|
|
shardRequests.put(shardId, shardRequest);
|
|
|
}
|
|
|
shardRequest.add(i, item);
|
|
|
}
|
|
|
|
|
|
- if (shardRequests.size() == 0) {
|
|
|
+ if (shardRequests.isEmpty()) {
|
|
|
// only failures..
|
|
|
listener.onResponse(new MultiGetResponse(responses.toArray(new MultiGetItemResponse[responses.length()])));
|
|
|
}
|
|
|
@@ -97,7 +108,8 @@ public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequ
|
|
|
@Override
|
|
|
public void onResponse(MultiGetShardResponse response) {
|
|
|
for (int i = 0; i < response.locations.size(); i++) {
|
|
|
- responses.set(response.locations.get(i), new MultiGetItemResponse(response.responses.get(i), response.failures.get(i)));
|
|
|
+ MultiGetItemResponse itemResponse = new MultiGetItemResponse(response.responses.get(i), response.failures.get(i));
|
|
|
+ responses.set(response.locations.get(i), itemResponse);
|
|
|
}
|
|
|
if (counter.decrementAndGet() == 0) {
|
|
|
finishHim();
|
|
|
@@ -109,8 +121,7 @@ public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequ
|
|
|
// create failures for all relevant requests
|
|
|
for (int i = 0; i < shardRequest.locations.size(); i++) {
|
|
|
MultiGetRequest.Item item = shardRequest.items.get(i);
|
|
|
- responses.set(shardRequest.locations.get(i), new MultiGetItemResponse(null,
|
|
|
- new MultiGetResponse.Failure(shardRequest.index(), item.type(), item.id(), e)));
|
|
|
+ responses.set(shardRequest.locations.get(i), newItemFailure(shardRequest.index(), item.type(), item.id(), e));
|
|
|
}
|
|
|
if (counter.decrementAndGet() == 0) {
|
|
|
finishHim();
|
|
|
@@ -123,4 +134,8 @@ public class TransportMultiGetAction extends HandledTransportAction<MultiGetRequ
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ private static MultiGetItemResponse newItemFailure(String index, String type, String id, Exception exception) {
|
|
|
+ return new MultiGetItemResponse(null, new MultiGetResponse.Failure(index, type, id, exception));
|
|
|
+ }
|
|
|
}
|