Consistent handling in search strategies

elastic · Oct 29, 2023 · 0a13dbe · 0a13dbe
1 parent 04eccf7
commit 0a13dbe
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -9,6 +9,7 @@
 import type { TransportResult } from '@elastic/elasticsearch';
 import { tap } from 'rxjs/operators';
 import type { IScopedClusterClient, Logger } from '@kbn/core/server';
+import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { SearchConfigSchema } from '../../../../config';
 import {
   EqlSearchStrategyRequest,
@@ -27,15 +28,19 @@ export const eqlSearchStrategyProvider = (
   searchConfig: SearchConfigSchema,
   logger: Logger
 ): ISearchStrategy<EqlSearchStrategyRequest, EqlSearchStrategyResponse> => {
-  async function cancelAsyncSearch(id: string, esClient: IScopedClusterClient) {
+  function cancelAsyncSearch(id: string, esClient: IScopedClusterClient) {
     const client = esClient.asCurrentUser.eql;
-    await client.delete({ id });
+    return client.delete({ id });
   }
 
   return {
-    cancel: (id, options, { esClient }) => {
+    cancel: async (id, options, { esClient }) => {
       logger.debug(`_eql/delete ${id}`);
-      return cancelAsyncSearch(id, esClient);
+      try {
+        await cancelAsyncSearch(id, esClient);
+      } catch (e) {
+        throw getKbnServerError(e);
+      }
     },
 
     search: ({ id, ...request }, options: IAsyncSearchOptions, { esClient, uiSettingsClient }) => {
@@ -80,7 +85,12 @@ export const eqlSearchStrategyProvider = (
         return toEqlKibanaSearchResponse(response as TransportResult<EqlSearchResponse>);
       };
 
-      const cancel = () => id && !options.isStored && cancelAsyncSearch(id, esClient);
+      const cancel = () => {
+        if (!id || options.isStored) return;
+        cancelAsyncSearch(id, esClient).catch(() => {
+          // Swallow errors from cancellation
+        });
+      };
 
       return pollSearch(search, cancel, {
         pollInterval: searchConfig.asyncSearch.pollInterval,

diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -45,7 +45,7 @@ export const enhancedEsSearchStrategyProvider = (
 ): ISearchStrategy => {
   function cancelAsyncSearch(id: string, esClient: IScopedClusterClient) {
     const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
-    return client.asyncSearch.delete({ id }).then(() => {});
+    return client.asyncSearch.delete({ id });
   }
 
   function asyncSearch(
@@ -79,7 +79,10 @@ export const enhancedEsSearchStrategyProvider = (
     };
 
     const cancel = () => {
-      if (id && !options.isStored) cancelAsyncSearch(id, esClient);
+      if (!id || options.isStored) return;
+      cancelAsyncSearch(id, esClient).catch(() => {
+        // Swallow errors from cancellation
+      });
     };
 
     return pollSearch(search, cancel, {

diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
@@ -28,9 +28,9 @@ export const sqlSearchStrategyProvider = (
   logger: Logger,
   useInternalUser: boolean = false
 ): ISearchStrategy<SqlSearchStrategyRequest, SqlSearchStrategyResponse> => {
-  async function cancelAsyncSearch(id: string, esClient: IScopedClusterClient) {
+  function cancelAsyncSearch(id: string, esClient: IScopedClusterClient) {
     const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
-    await client.sql.deleteAsync({ id });
+    return client.sql.deleteAsync({ id });
   }
 
   function asyncSearch(
@@ -79,7 +79,12 @@ export const sqlSearchStrategyProvider = (
       return toAsyncKibanaSearchResponse(body, startTime, headers?.warning);
     };
 
-    const cancel = () => id && !options.isStored && cancelAsyncSearch(id, esClient);
+    const cancel = () => {
+      if (!id || options.isStored) return;
+      cancelAsyncSearch(id, esClient).catch(() => {
+        // Swallow errors from cancellation
+      });
+    };
 
     return pollSearch(search, cancel, {
       pollInterval: searchConfig.asyncSearch.pollInterval,
@@ -112,9 +117,13 @@ export const sqlSearchStrategyProvider = (
      * @returns `Promise<void>`
      * @throws `KbnServerError`
      */
-    cancel: (id, options, { esClient }) => {
+    cancel: async (id, options, { esClient }) => {
       logger.debug(`sql search: cancel async_search_id=${id}`);
-      return cancelAsyncSearch(id, esClient);
+      try {
+        await cancelAsyncSearch(id, esClient);
+      } catch (e) {
+        throw getKbnServerError(e);
+      }
     },
     /**
      *