Revert "[data.search.bsearch] Forward request abortSignal to search strategy (#169041)"

lukasolson · lukasolson · commit 8ca90b4047cc · 2023-10-24T08:08:18.000-07:00
This reverts commit 24fd951.
diff --git a/src/plugins/data/common/search/utils.ts b/src/plugins/data/common/search/utils.ts
@@ -23,9 +23,7 @@ export const isAbortResponse = (response?: IKibanaSearchResponse) => {
 /**
  * @returns true if request is still running
  */
-export const isRunningResponse = (response?: IKibanaSearchResponse) => {
-  return response?.isRunning ?? false;
-};
+export const isRunningResponse = (response?: IKibanaSearchResponse) => response?.isRunning ?? false;
 
 export const getUserTimeZone = (
   getConfig: AggTypesDependencies['getConfig'],
diff --git a/src/plugins/data/server/search/routes/bsearch.ts b/src/plugins/data/server/search/routes/bsearch.ts
@@ -11,7 +11,6 @@ import { catchError } from 'rxjs/operators';
 import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import type { ExecutionContextSetup } from '@kbn/core/server';
 import apm from 'elastic-apm-node';
-import { getRequestAbortedSignal } from '../..';
 import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
@@ -29,7 +28,6 @@ export function registerBsearchRoute(
     IKibanaSearchResponse
   >('/internal/bsearch', (request) => {
     const search = getScoped(request);
-    const abortSignal = getRequestAbortedSignal(request.events.aborted$);
     return {
       /**
        * @param requestOptions
@@ -41,7 +39,7 @@ export function registerBsearchRoute(
           apm.addLabels(executionContextService.getAsLabels());
 
           return firstValueFrom(
-            search.search(requestData, { ...restOptions, abortSignal }).pipe(
+            search.search(requestData, restOptions).pipe(
               catchError((err) => {
                 // Re-throw as object, to get attributes passed to the client
                 // eslint-disable-next-line no-throw-literal
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
@@ -260,38 +260,6 @@ describe('ES search strategy', () => {
 
         expect(mockApiCaller).toBeCalledTimes(0);
       });
-
-      it('should delete when aborted', async () => {
-        mockSubmitCaller.mockResolvedValueOnce({
-          ...mockAsyncResponse,
-          body: {
-            ...mockAsyncResponse.body,
-            is_running: true,
-          },
-        });
-
-        const params = { index: 'logstash-*', body: { query: {} } };
-        const esSearch = await enhancedEsSearchStrategyProvider(
-          mockLegacyConfig$,
-          mockSearchConfig,
-          mockLogger
-        );
-        const abortController = new AbortController();
-        const abortSignal = abortController.signal;
-
-        // Abort after an incomplete first response is returned
-        setTimeout(() => abortController.abort(), 100);
-
-        let err: KbnServerError | undefined;
-        try {
-          await esSearch.search({ params }, { abortSignal }, mockDeps).toPromise();
-        } catch (e) {
-          err = e;
-        }
-        expect(mockSubmitCaller).toBeCalled();
-        expect(err).not.toBeUndefined();
-        expect(mockDeleteCaller).toBeCalled();
-      });
     });
 
     describe('with sessionId', () => {
@@ -399,44 +367,6 @@ describe('ES search strategy', () => {
         expect(request).toHaveProperty('wait_for_completion_timeout');
         expect(request).not.toHaveProperty('keep_alive');
       });
-
-      it('should not delete a saved session when aborted', async () => {
-        mockSubmitCaller.mockResolvedValueOnce({
-          ...mockAsyncResponse,
-          body: {
-            ...mockAsyncResponse.body,
-            is_running: true,
-          },
-        });
-
-        const params = { index: 'logstash-*', body: { query: {} } };
-        const esSearch = await enhancedEsSearchStrategyProvider(
-          mockLegacyConfig$,
-          mockSearchConfig,
-          mockLogger
-        );
-        const abortController = new AbortController();
-        const abortSignal = abortController.signal;
-
-        // Abort after an incomplete first response is returned
-        setTimeout(() => abortController.abort(), 100);
-
-        let err: KbnServerError | undefined;
-        try {
-          await esSearch
-            .search(
-              { params },
-              { abortSignal, sessionId: '1', isSearchStored: true, isStored: true },
-              mockDeps
-            )
-            .toPromise();
-        } catch (e) {
-          err = e;
-        }
-        expect(mockSubmitCaller).toBeCalled();
-        expect(err).not.toBeUndefined();
-        expect(mockDeleteCaller).not.toBeCalled();
-      });
     });
 
     it('throws normalized error if ResponseError is thrown', async () => {
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
@@ -83,7 +83,7 @@ export const enhancedEsSearchStrategyProvider = (
     };
 
     const cancel = async () => {
-      if (id && !options.isStored) {
+      if (id) {
         await cancelAsyncSearch(id, esClient);
       }
     };

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export const enhancedEsSearchStrategyProvider = (`
`83`	`83`	`};`
`84`	`84`
`85`	`85`	`const cancel = async () => {`
`86`		`- if (id && !options.isStored) {`
	`86`	`+ if (id) {`
`87`	`87`	`await cancelAsyncSearch(id, esClient);`
`88`	`88`	`}`
`89`	`89`	`};`