Skip to content

Commit 5c9c65b

Browse files
spinscalednhatn
authored andcommitted
Make PIT validation error actionable (#74224)
Closes #74223
1 parent a4c0ef9 commit 5c9c65b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ static void preparePointInTime(SearchRequest request, RestRequest restRequest, N
315315
assert request.pointInTimeBuilder() != null;
316316
ActionRequestValidationException validationException = null;
317317
if (request.indices().length > 0) {
318-
validationException = addValidationError("[indices] cannot be used with point in time", validationException);
318+
validationException = addValidationError("[indices] cannot be used with point in time. Do " +
319+
"not specify any index with point in time.", validationException);
319320
}
320321
if (request.indicesOptions().equals(DEFAULT_INDICES_OPTIONS) == false) {
321322
validationException = addValidationError("[indicesOptions] cannot be used with point in time", validationException);

x-pack/plugin/async-search/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/search/AsyncSearchSecurityIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public void testRejectPointInTimeWithIndices() throws Exception {
224224
request.setJsonEntity(Strings.toString(requestBody));
225225
final ResponseException exc = expectThrows(ResponseException.class, () -> client().performRequest(request));
226226
assertThat(exc.getResponse().getStatusLine().getStatusCode(), equalTo(400));
227-
assertThat(exc.getMessage(), containsString("[indices] cannot be used with point in time"));
227+
assertThat(exc.getMessage(), containsString("[indices] cannot be used with point in time. Do not specify any index with point in time."));
228228
} finally {
229229
closePointInTime(pitId, authorizedUser);
230230
}

0 commit comments

Comments
 (0)