From 04db24e6d489c1e7f58203ce0c62e3f27db53359 Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 12 Sep 2014 17:30:01 +0200 Subject: [PATCH] Internal: make sure that original headers are used when executing search as part of put warmer Closes #7711 --- .../admin/indices/warmer/put/TransportPutWarmerAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java index 758b898f80d40..5ccd1f0653e04 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java @@ -21,6 +21,7 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; +import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.support.ActionFilters; @@ -85,7 +86,8 @@ protected ClusterBlockException checkBlock(PutWarmerRequest request, ClusterStat @Override protected void masterOperation(final PutWarmerRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { // first execute the search request, see that its ok... - searchAction.execute(request.searchRequest(), new ActionListener() { + SearchRequest searchRequest = new SearchRequest(request.searchRequest(), request); + searchAction.execute(searchRequest, new ActionListener() { @Override public void onResponse(SearchResponse searchResponse) { if (searchResponse.getFailedShards() > 0) {