honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes from review

Browse Source
This commit is contained in:
Nik Everett 2016-01-28 16:51:17 -05:00
parent 72b2ea781b
commit 0aeeef87d2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/plugins/reindex.asciidoc
View File

@ -466,12 +466,12 @@ Sending the `refresh` url parameter will cause all indexes to which the request
wrote to be refreshed. This is different than the Index API's `refresh` wrote to be refreshed. This is different than the Index API's `refresh`
parameter which causes just the shard that received the new data to be indexed. parameter which causes just the shard that received the new data to be indexed.
If the request contains `wait_for_completion=false` then Elaasticsearch will If the request contains `wait_for_completion=false` then Elasticsearch will
perform some preflight checks, launch the request, and then return a `task` perform some preflight checks, launch the request, and then return a `task`
which can be used with {ref}/tasks.html[Tasks APIs] to cancel or get the status which can be used with {ref}/tasks.html[Tasks APIs] to cancel or get the status
of the task. For now, once the request is finished the task is gone and the of the task. For now, once the request is finished the task is gone and the
only place to look for the ultimate result of the task is in the Elasticsearch only place to look for the ultimate result of the task is in the Elasticsearch
log file. This be fixed soon. log file. This will be fixed soon.
`consistency` controls how many copies of a shard must respond to each write `consistency` controls how many copies of a shard must respond to each write
request. `timeout` controls how long each write request waits for unavailable request. `timeout` controls how long each write request waits for unavailable

9
plugins/reindex/src/main/java/org/elasticsearch/plugin/reindex/AbstractBaseReindexRestHandler.java
View File

@ -19,6 +19,8 @@
package org.elasticsearch.plugin.reindex; package org.elasticsearch.plugin.reindex;
import java.io.IOException;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.NoopActionListener; import org.elasticsearch.action.NoopActionListener;
@ -36,8 +38,6 @@ import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.Task;
import java.io.IOException;
public abstract class AbstractBaseReindexRestHandler<Request extends ActionRequest<Request>, Response extends BulkIndexByScrollResponse, TA extends TransportAction<Request, Response>> public abstract class AbstractBaseReindexRestHandler<Request extends ActionRequest<Request>, Response extends BulkIndexByScrollResponse, TA extends TransportAction<Request, Response>>
extends BaseRestHandler { extends BaseRestHandler {
protected final IndicesQueriesRegistry indicesQueriesRegistry; protected final IndicesQueriesRegistry indicesQueriesRegistry;
@ -58,8 +58,9 @@ public abstract class AbstractBaseReindexRestHandler<Request extends ActionReque
return; return;
} }
/* /*
* Lets try and validate before forking launching the task so we can * Lets try and validate before forking so the user gets some error. The
* return errors even if we aren't waiting. * task can't totally validate until it starts but this is better than
* nothing.
*/ */
ActionRequestValidationException validationException = internalRequest.validate(); ActionRequestValidationException validationException = internalRequest.validate();
if (validationException != null) { if (validationException != null) {