diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 1c01da64d45f1..040be4742ddb3 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -611,8 +611,10 @@ public String getDescription() { Strings.arrayToDelimitedString(indices, ",", sb); sb.append("], "); sb.append("search_type[").append(searchType).append("], "); + if (scroll != null) { + sb.append("scroll[").append(scroll.keepAlive()).append("], "); + } if (source != null) { - sb.append("source[").append(source.toString(FORMAT_PARAMS)).append("]"); } else { sb.append("source[]"); diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java index 7ba20d24efd8f..5ff66a0709701 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java @@ -30,6 +30,7 @@ import org.elasticsearch.search.Scroll; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.rescore.QueryRescorerBuilder; +import org.elasticsearch.tasks.TaskId; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; @@ -37,7 +38,9 @@ import java.util.ArrayList; import java.util.List; +import static java.util.Collections.emptyMap; import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.hamcrest.Matchers.equalTo; public class SearchRequestTests extends AbstractSearchTestCase { @@ -193,4 +196,17 @@ private SearchRequest mutate(SearchRequest searchRequest) { randomFrom(mutators).run(); return mutation; } + + public void testDescriptionForDefault() { + assertThat(toDescription(new SearchRequest()), equalTo("indices[], search_type[QUERY_THEN_FETCH], source[]")); + } + + public void testDescriptionIncludesScroll() { + assertThat(toDescription(new SearchRequest().scroll(TimeValue.timeValueMinutes(5))), + equalTo("indices[], search_type[QUERY_THEN_FETCH], scroll[5m], source[]")); + } + + private String toDescription(SearchRequest request) { + return request.createTask(0, "test", SearchAction.NAME, TaskId.EMPTY_TASK_ID, emptyMap()).getDescription(); + } }