Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix validation of close_pit request #88702

Merged
merged 5 commits into from
Jul 22, 2022
Merged

Fix validation of close_pit request #88702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
623d0fc
Fix validation of close_pit request
dnhatn Jul 22, 2022
fc1fd9b
Update docs/changelog/88702.yaml
dnhatn Jul 22, 2022
2a226e4
catch validate
dnhatn Jul 21, 2022
a39888e
Merge remote-tracking branch 'dnhatn/validate_close_pit' into validat…
dnhatn Jul 22, 2022
1cd665c
Fix PutLifecycleActionRequest#validate
dnhatn Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/88702.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 88702
summary: Fix validation of `close_pit` request
area: Search
type: bug
issues: []
8 changes: 8 additions & 0 deletions server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.tasks.TaskInfo;
import org.elasticsearch.test.ESIntegTestCase;

import java.util.HashSet;
Expand All @@ -42,6 +43,7 @@
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.everyItem;
import static org.hamcrest.Matchers.in;
Expand Down Expand Up @@ -418,6 +420,12 @@ public void testPITTiebreak() throws Exception {
}
}

public void testCloseInvalidPointInTime() {
expectThrows(Exception.class, () -> client().execute(ClosePointInTimeAction.INSTANCE, new ClosePointInTimeRequest("")).actionGet());
List<TaskInfo> tasks = client().admin().cluster().prepareListTasks().setActions(ClosePointInTimeAction.NAME).get().getTasks();
assertThat(tasks, empty());
}

@SuppressWarnings({ "rawtypes", "unchecked" })
private void assertPagination(PointInTimeBuilder pit, int expectedNumDocs, int size, SortBuilder<?>... sorts) throws Exception {
Set<String> seen = new HashSet<>();
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ValidateActions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -41,7 +42,7 @@ public String getId() {
@Override
public ActionRequestValidationException validate() {
if (Strings.isEmpty(id)) {
throw new IllegalArgumentException("reader id must be specified");
return ValidateActions.addValidationError("id is empty", null);
}
return null;
}
Expand Down
11 changes: 9 additions & 2 deletions server/src/main/java/org/elasticsearch/action/support/TransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,19 @@ protected TransportAction(String actionName, ActionFilters actionFilters, TaskMa
* Use this method when the transport action should continue to run in the context of the current task
*/
public final void execute(Task task, Request request, ActionListener<Response> listener) {
ActionRequestValidationException validationException = request.validate();
final ActionRequestValidationException validationException;
try {
validationException = request.validate();
} catch (Exception e) {
Copy link
Contributor

@mayya-sharipova mayya-sharipova Jul 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am trying to understand this part of code. If assertion is always false, it means we will always throw AssertionError, right? So the code after assert false will never be executed?

Or are we checking assertions only during testing mode? And in runtime mode we don't execute assertions?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mayya-sharipova Here we fail with AssertionError in tests, but log a warning message and fail the request with an exception in production.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dnhatn Thanks for clarifying, I was also thinking the same.

assert false : new AssertionError("validating of request [" + request + "] threw exception", e);
logger.warn("validating of request [" + request + "] threw exception", e);
listener.onFailure(e);
return;
}
if (validationException != null) {
listener.onFailure(validationException);
return;
}

if (task != null && request.getShouldStoreResult()) {
listener = new TaskResultStoringActionListener<>(taskManager, task, listener);
}
Expand Down
7 changes: 6 additions & 1 deletion ...plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/action/PutLifecycleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.ValidateActions;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -62,8 +63,12 @@ public LifecyclePolicy getPolicy() {

@Override
public ActionRequestValidationException validate() {
this.policy.validate();
ActionRequestValidationException err = null;
try {
this.policy.validate();
} catch (IllegalArgumentException iae) {
err = ValidateActions.addValidationError(iae.getMessage(), null);
}
String phaseTimingErr = TimeseriesLifecycleType.validateMonotonicallyIncreasingPhaseTimings(this.policy.getPhases().values());
if (Strings.hasText(phaseTimingErr)) {
err = new ActionRequestValidationException();
Expand Down