From 36fbb6a26f8fc4eb7f38f98a2fadbf172aa7ca9f Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Fri, 12 Jan 2024 15:59:20 +0100 Subject: [PATCH] remove custom cancelation timoout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it shouldn’t be needed since https://github.com/elastic/kibana/pull/169041 is fixed --- .../esql_search/esql_search_strategy.ts | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/plugins/data/server/search/strategies/esql_search/esql_search_strategy.ts b/src/plugins/data/server/search/strategies/esql_search/esql_search_strategy.ts index 4c329b9b91a6a1..1ad5b8fe0a5dd8 100644 --- a/src/plugins/data/server/search/strategies/esql_search/esql_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/esql_search/esql_search_strategy.ts @@ -7,14 +7,11 @@ */ import { from } from 'rxjs'; -import { ensureDuration } from '@kbn/config-schema/src/duration'; import type { Logger } from '@kbn/core/server'; import { getKbnSearchError, KbnSearchError } from '../../report_search_error'; import type { ISearchStrategy } from '../../types'; import { sanitizeRequestParams } from '../../sanitize_request_params'; -const ES_TIMEOUT_IN_MS = 120000; - export const esqlSearchStrategyProvider = ( logger: Logger, useInternalUser: boolean = false @@ -27,19 +24,6 @@ export const esqlSearchStrategyProvider = ( * @returns `Observable>` */ search: (request, { abortSignal, ...options }, { esClient, uiSettingsClient }) => { - const abortController = new AbortController(); - - // We found out that there are cases where we are not aborting correctly - // For this reason we want to manually abort after 2 minute or after the custom options.transport?.requestTimeout - const forceAbortTimeout = options.transport?.requestTimeout - ? ensureDuration(options.transport?.requestTimeout).asMilliseconds() - : ES_TIMEOUT_IN_MS; - abortSignal?.addEventListener('abort', () => { - abortController.abort(); - }); - // Also abort after two mins or after the custom options.transport?.requestTimeout - setTimeout(() => abortController.abort(), forceAbortTimeout); - // Only default index pattern type is supported here. // See ese for other type support. if (request.indexType) { @@ -58,7 +42,7 @@ export const esqlSearchStrategyProvider = ( }, }, { - signal: abortController.signal, + signal: abortSignal, meta: true, // we don't want the ES client to retry (default value is 3) maxRetries: 0,