Fix expiration time in async search response

client/rest-high-level/src/main/java/org/elasticsearch/client/asyncsearch/GetAsyncSearchRequest.java

@@ -32,8 +32,6 @@ public class GetAsyncSearchRequest implements Validatable {
     private TimeValue waitForCompletion;
     private TimeValue keepAlive;
 
-    public static final long MIN_KEEPALIVE = TimeValue.timeValueMinutes(1).millis();
-
     private final String id;
 
     public GetAsyncSearchRequest(String id) {
@@ -62,14 +60,7 @@ public void setKeepAlive(TimeValue keepAlive) {
 
     @Override
     public Optional<ValidationException> validate() {
-        final ValidationException validationException = new ValidationException();
-        if (keepAlive != null && keepAlive.getMillis() < MIN_KEEPALIVE) {
-            validationException.addValidationError("keep_alive must be greater than 1 minute, got: " + keepAlive.toString());
-        }
-        if (validationException.validationErrors().isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(validationException);
+        return Optional.empty();
     }
 
     @Override

client/rest-high-level/src/main/java/org/elasticsearch/client/asyncsearch/SubmitAsyncSearchRequest.java

@@ -36,8 +36,6 @@
  */
 public class SubmitAsyncSearchRequest implements Validatable {
 
-    public static final int DEFAULT_BATCHED_REDUCE_SIZE = 5;
-
     public static long MIN_KEEP_ALIVE = TimeValue.timeValueMinutes(1).millis();
 
     private TimeValue waitForCompletionTimeout;

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/AsyncSearch.java

@@ -15,9 +15,9 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.IndexScopedSettings;
+import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
-import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
@@ -39,6 +39,8 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.elasticsearch.xpack.search.AsyncSearchMaintenanceService.ASYNC_SEARCH_CLEANUP_INTERVAL_SETTING;
+
 public final class AsyncSearch extends Plugin implements ActionPlugin {
     private final Settings settings;
 
@@ -84,11 +86,16 @@ public Collection<Object> createComponents(Client client,
             AsyncSearchIndexService indexService =
                 new AsyncSearchIndexService(clusterService, threadPool.getThreadContext(), client, namedWriteableRegistry);
             AsyncSearchMaintenanceService maintenanceService =
-                new AsyncSearchMaintenanceService(nodeEnvironment.nodeId(), threadPool, indexService, TimeValue.timeValueHours(1));
+                new AsyncSearchMaintenanceService(nodeEnvironment.nodeId(), settings, threadPool, indexService);
             clusterService.addListener(maintenanceService);
             return Collections.singletonList(maintenanceService);
         } else {
             return Collections.emptyList();
         }
     }
+
+    @Override
+    public List<Setting<?>> getSettings() {
+        return Collections.singletonList(ASYNC_SEARCH_CLEANUP_INTERVAL_SETTING);
+    }
 }

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/AsyncSearchIndexService.java

@@ -265,14 +265,17 @@ void getResponse(AsyncSearchId searchId,
                     return;
                 }
 
-                if (restoreResponseHeaders) {
+                if (restoreResponseHeaders && get.getSource().containsKey(RESPONSE_HEADERS_FIELD)) {
                     @SuppressWarnings("unchecked")
                     Map<String, List<String>> responseHeaders = (Map<String, List<String>>) get.getSource().get(RESPONSE_HEADERS_FIELD);
                     restoreResponseHeadersContext(securityContext.getThreadContext(), responseHeaders);
                 }
 
+                long expirationTime = (long) get.getSource().get(EXPIRATION_TIME_FIELD);
                 String encoded = (String) get.getSource().get(RESULT_FIELD);
-                listener.onResponse(encoded != null ? decodeResponse(encoded) : null);
+                AsyncSearchResponse response = decodeResponse(encoded);
+                response.setExpirationTime(expirationTime);
+                listener.onResponse(encoded != null ? response : null);
             },
             listener::onFailure
         ));

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/AsyncSearchMaintenanceService.java

@@ -14,6 +14,8 @@
 import org.elasticsearch.cluster.ClusterStateListener;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
 import org.elasticsearch.common.lease.Releasable;
+import org.elasticsearch.common.settings.Setting;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
 import org.elasticsearch.gateway.GatewayService;
@@ -26,13 +28,17 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.elasticsearch.xpack.search.AsyncSearchIndexService.EXPIRATION_TIME_FIELD;
+import static org.elasticsearch.xpack.search.AsyncSearchIndexService.INDEX;
 
 /**
  * A service that runs a periodic cleanup over the async-search index.
  */
 class AsyncSearchMaintenanceService implements Releasable, ClusterStateListener {
     private static final Logger logger = LogManager.getLogger(AsyncSearchMaintenanceService.class);
 
+    public static final Setting<TimeValue> ASYNC_SEARCH_CLEANUP_INTERVAL_SETTING =
+        Setting.timeSetting("async_search.index_cleanup_interval", TimeValue.timeValueHours(1), Setting.Property.NodeScope);
+
     private final String localNodeId;
     private final ThreadPool threadPool;
     private final AsyncSearchIndexService indexService;
@@ -43,13 +49,13 @@ class AsyncSearchMaintenanceService implements Releasable, ClusterStateListener
     private volatile Scheduler.Cancellable cancellable;
 
     AsyncSearchMaintenanceService(String localNodeId,
+                                  Settings nodeSettings,
                                   ThreadPool threadPool,
-                                  AsyncSearchIndexService indexService,
-                                  TimeValue delay) {
+                                  AsyncSearchIndexService indexService) {
         this.localNodeId = localNodeId;
         this.threadPool = threadPool;
         this.indexService = indexService;
-        this.delay = delay;
+        this.delay = ASYNC_SEARCH_CLEANUP_INTERVAL_SETTING.get(nodeSettings);
     }
 
     @Override
@@ -62,31 +68,29 @@ public void clusterChanged(ClusterChangedEvent event) {
         tryStartCleanup(state);
     }
 
-    void tryStartCleanup(ClusterState state) {
+    synchronized void tryStartCleanup(ClusterState state) {
         if (isClosed.get()) {
             return;
         }
         IndexRoutingTable indexRouting = state.routingTable().index(AsyncSearchIndexService.INDEX);
         if (indexRouting == null) {
-            if (isCleanupRunning.compareAndSet(true, false)) {
-                close();
-            }
+            stop();
             return;
         }
         String primaryNodeId = indexRouting.shard(0).primaryShard().currentNodeId();
         if (localNodeId.equals(primaryNodeId)) {
             if (isCleanupRunning.compareAndSet(false, true)) {
                 executeNextCleanup();
             }
-        } else if (isCleanupRunning.compareAndSet(true, false)) {
-            close();
+        } else {
+            stop();
         }
     }
 
     synchronized void executeNextCleanup() {
         if (isClosed.get() == false && isCleanupRunning.get()) {
             long nowInMillis = System.currentTimeMillis();
-            DeleteByQueryRequest toDelete = new DeleteByQueryRequest()
+            DeleteByQueryRequest toDelete = new DeleteByQueryRequest(INDEX)
                 .setQuery(QueryBuilders.rangeQuery(EXPIRATION_TIME_FIELD).lte(nowInMillis));
             indexService.getClient()
                 .execute(DeleteByQueryAction.INSTANCE, toDelete, ActionListener.wrap(() -> scheduleNextCleanup()));
@@ -107,11 +111,17 @@ synchronized void scheduleNextCleanup() {
         }
     }
 
+    synchronized void stop() {
+        if (isCleanupRunning.compareAndSet(true, false)) {
+            if (cancellable != null && cancellable.isCancelled() == false) {
+                cancellable.cancel();
+            }
+        }
+    }
+
     @Override
     public void close() {
-        if (cancellable != null && cancellable.isCancelled() == false) {
-            cancellable.cancel();
-        }
+        stop();
         isClosed.compareAndSet(false, true);
     }
 }

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/AsyncSearchTask.java

@@ -297,6 +297,7 @@ private void executeCompletionListeners() {
      */
     private AsyncSearchResponse getResponse() {
         assert searchResponse.get() != null;
+        checkCancellation();
         return searchResponse.get().toAsyncSearchResponse(this, expirationTimeMillis);
     }
 
@@ -306,15 +307,17 @@ private AsyncSearchResponse getResponse() {
      */
     private AsyncSearchResponse getResponseWithHeaders() {
         assert searchResponse.get() != null;
+        checkCancellation();
         return searchResponse.get().toAsyncSearchResponseWithHeaders(this, expirationTimeMillis);
     }
 
 
 
     // checks if the search task should be cancelled
-    private void checkCancellation() {
+    private synchronized void checkCancellation() {
         long now = System.currentTimeMillis();
-        if (expirationTimeMillis < now || checkSubmitCancellation.getAsBoolean()) {
+        if (hasCompleted == false &&
+                expirationTimeMillis < now || checkSubmitCancellation.getAsBoolean()) {
             // we cancel the search task if the initial submit task was cancelled,
             // this is needed because the task cancellation mechanism doesn't
             // handle the cancellation of grand-children.
@@ -338,7 +341,7 @@ protected void onQueryFailure(int shardIndex, SearchShardTarget shardTarget, Exc
             // best effort to cancel expired tasks
             checkCancellation();
             searchResponse.get().addShardFailure(shardIndex,
-                new ShardSearchFailure(exc, shardTarget.getNodeId() != null ? shardTarget : null));
+                new ShardSearchFailure(exc, shardTarget.getNodeIdText() != null ? shardTarget : null));
         }
 
         @Override

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/TransportSubmitAsyncSearchAction.java

@@ -25,6 +25,7 @@
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.index.engine.DocumentMissingException;
+import org.elasticsearch.index.engine.VersionConflictEngineException;
 import org.elasticsearch.search.SearchService;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.tasks.CancellableTask;
@@ -187,7 +188,8 @@ private void onFinalResponse(CancellableTask submitTask,
             store.storeFinalResponse(searchTask.getSearchId().getDocId(), threadContext.getResponseHeaders(),response,
                 ActionListener.wrap(resp -> unregisterTaskAndMoveOn(searchTask, nextAction),
                                     exc -> {
-                                        if (exc.getCause() instanceof DocumentMissingException == false) {
+                                        if (exc.getCause() instanceof DocumentMissingException == false &&
+                                                exc.getCause() instanceof VersionConflictEngineException == false) {
                                             logger.error(() -> new ParameterizedMessage("failed to store async-search [{}]",
                                                 searchTask.getSearchId().getEncoded()), exc);
                                         }