[Search] Remove client side shard timeout

src/legacy/core_plugins/elasticsearch/index.js

@@ -44,7 +44,6 @@ export default function (kibana) {
 
       defaultVars = {
         esRequestTimeout: esConfig.requestTimeout.asMilliseconds(),
-        esShardTimeout: esConfig.shardTimeout.asMilliseconds(),
         esApiVersion: esConfig.apiVersion,
       };
 

src/plugins/data/public/search/fetch/get_search_params.test.ts

@@ -59,13 +59,4 @@ describe('getSearchParams', () => {
     searchParams = getSearchParams(config);
     expect(searchParams.max_concurrent_shard_requests).toBe(5);
   });
-
-  test('includes timeout according to esShardTimeout if greater than 0', () => {
-    const config = getConfigStub();
-    let searchParams = getSearchParams(config, 0);
-    expect(searchParams.timeout).toBe(undefined);
-
-    searchParams = getSearchParams(config, 100);
-    expect(searchParams.timeout).toBe('100ms');
-  });
 });

src/plugins/data/public/search/fetch/get_search_params.ts

@@ -23,14 +23,13 @@ import { SearchRequest } from './types';
 
 const sessionId = Date.now();
 
-export function getSearchParams(config: IUiSettingsClient, esShardTimeout: number = 0) {
+export function getSearchParams(config: IUiSettingsClient) {
   return {
     rest_total_hits_as_int: true,
     ignore_unavailable: true,
     ignore_throttled: getIgnoreThrottled(config),
     max_concurrent_shard_requests: getMaxConcurrentShardRequests(config),
     preference: getPreference(config),
-    timeout: getTimeout(esShardTimeout),
   };
 }
 
@@ -51,17 +50,12 @@ export function getPreference(config: IUiSettingsClient) {
     : undefined;
 }
 
-export function getTimeout(esShardTimeout: number) {
-  return esShardTimeout > 0 ? `${esShardTimeout}ms` : undefined;
-}
-
 export function getSearchParamsFromRequest(
   searchRequest: SearchRequest,
   dependencies: { injectedMetadata: CoreStart['injectedMetadata']; uiSettings: IUiSettingsClient }
 ): ISearchRequestParams {
-  const { injectedMetadata, uiSettings } = dependencies;
-  const esShardTimeout = injectedMetadata.getInjectedVar('esShardTimeout') as number;
-  const searchParams = getSearchParams(uiSettings, esShardTimeout);
+  const { uiSettings } = dependencies;
+  const searchParams = getSearchParams(uiSettings);
 
   return {
     index: searchRequest.index.title || searchRequest.index,

src/plugins/data/public/search/fetch/types.ts

@@ -31,7 +31,6 @@ export interface FetchOptions {
 export interface FetchHandlers {
   legacySearchService: ISearchStartLegacy;
   config: IUiSettingsClient;
-  esShardTimeout: number;
 }
 
 export interface SearchError {

src/plugins/data/public/search/legacy/call_client.test.ts

@@ -54,7 +54,7 @@ describe('callClient', () => {
 
   test('Passes the additional arguments it is given to the search strategy', () => {
     const searchRequests = [{ _searchStrategyId: 0 }];
-    const args = { legacySearchService: {}, config: {}, esShardTimeout: 0 } as FetchHandlers;
+    const args = { legacySearchService: {}, config: {} } as FetchHandlers;
 
     callClient(searchRequests, [], args);
 

src/plugins/data/public/search/legacy/default_search_strategy.test.ts

@@ -62,7 +62,6 @@ describe('defaultSearchStrategy', function () {
             index: { title: 'foo' },
           },
         ],
-        esShardTimeout: 0,
         legacySearchService: searchService.__LEGACY,
       };
 

src/plugins/data/public/search/legacy/default_search_strategy.ts

@@ -30,12 +30,7 @@ export const defaultSearchStrategy: SearchStrategyProvider = {
   },
 };
 
-function msearch({
-  searchRequests,
-  legacySearchService,
-  config,
-  esShardTimeout,
-}: SearchStrategySearchParams) {
+function msearch({ searchRequests, legacySearchService, config }: SearchStrategySearchParams) {
   const es = legacySearchService.esClient;
   const inlineRequests = searchRequests.map(({ index, body, search_type: searchType }) => {
     const inlineHeader = {
@@ -46,7 +41,6 @@ function msearch({
     };
     const inlineBody = {
       ...body,
-      timeout: getTimeout(esShardTimeout),
     };
     return `${JSON.stringify(inlineHeader)}\n${JSON.stringify(inlineBody)}`;
   });

src/plugins/data/public/search/search_source/search_source.ts

@@ -221,8 +221,7 @@ export class SearchSource {
    * @return {Promise<SearchResponse<unknown>>}
    */
   private async legacyFetch(searchRequest: SearchRequest, options: FetchOptions) {
-    const { injectedMetadata, legacySearch, uiSettings } = this.dependencies;
-    const esShardTimeout = injectedMetadata.getInjectedVar('esShardTimeout') as number;
+    const { legacySearch, uiSettings } = this.dependencies;
 
     return await fetchSoon(
       searchRequest,
@@ -233,7 +232,6 @@ export class SearchSource {
       {
         legacySearchService: legacySearch,
         config: uiSettings,
-        esShardTimeout,
       }
     );
   }

src/plugins/vis_type_vega/public/plugin.ts

@@ -78,7 +78,6 @@ export class VegaPlugin implements Plugin<Promise<void>, void> {
   ) {
     setInjectedVars({
       enableExternalUrls: this.initializerContext.config.get().enableExternalUrls,
-      esShardTimeout: core.injectedMetadata.getInjectedVar('esShardTimeout') as number,
       emsTileLayerId: core.injectedMetadata.getInjectedVar('emsTileLayerId', true),
     });
     setUISettings(core.uiSettings);

src/plugins/vis_type_vega/public/services.ts

@@ -48,7 +48,6 @@ export const [getSavedObjects, setSavedObjects] = createGetterSetter<SavedObject
 );
 
 export const [getInjectedVars, setInjectedVars] = createGetterSetter<{
-  esShardTimeout: number;
   enableExternalUrls: boolean;
   emsTileLayerId: unknown;
 }>('InjectedVars');

src/plugins/vis_type_vega/public/vega_visualization.test.js

@@ -82,7 +82,6 @@ describe('VegaVisualizations', () => {
     setInjectedVars({
       emsTileLayerId: {},
       enableExternalUrls: true,
-      esShardTimeout: 10000,
     });
     setData(dataPluginStart);
     setSavedObjects(coreStart.savedObjects);