Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Search] Re-add support for aborting when a connection is closed #76470

Merged
merged 6 commits into from
Sep 13, 2020
Merged

[Search] Re-add support for aborting when a connection is closed #76470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a69b51
[Search] Re-add support for aborting when a connection is closed
lukasolson Sep 2, 2020
c1eb891
Merge branch 'master' into search-abort
elasticmachine Sep 6, 2020
3545c08
Merge branch 'master' into search-abort
lukasolson Sep 10, 2020
7eebd72
Merge remote-tracking branch 'origin/search-abort' into search-abort
lukasolson Sep 10, 2020
4a6457b
Merge branch 'master' into search-abort
lukasolson Sep 13, 2020
5e5fbc7
Fix types
lukasolson Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/plugins/data/server/search/es_search/es_search_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ export const esSearchStrategyProvider = (
});

try {
const esResponse = (await context.core.elasticsearch.client.asCurrentUser.search(
params
)) as ApiResponse<SearchResponse<any>>;
const rawResponse = esResponse.body;
// Temporary workaround until https://github.com/elastic/elasticsearch-js/issues/1297
const promise = context.core.elasticsearch.client.asCurrentUser.search(params);
if (options?.abortSignal)
options.abortSignal.addEventListener('abort', () => promise.abort());
const { body: rawResponse } = (await promise) as ApiResponse<SearchResponse<any>>;

if (usage) usage.trackSuccess(rawResponse.took);

Expand Down
26 changes: 18 additions & 8 deletions x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { first } from 'rxjs/operators';
import { SearchResponse } from 'elasticsearch';
import { Observable } from 'rxjs';
import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
import { SharedGlobalConfig, RequestHandlerContext, Logger } from '../../../../../src/core/server';
import {
getTotalLoaded,
Expand Down Expand Up @@ -40,8 +41,8 @@ export const enhancedEsSearchStrategyProvider = (

try {
const response = isAsync
? await asyncSearch(context, request)
: await rollupSearch(context, request);
? await asyncSearch(context, request, options)
: await rollupSearch(context, request, options);

if (
usage &&
Expand Down Expand Up @@ -69,9 +70,10 @@ export const enhancedEsSearchStrategyProvider = (

async function asyncSearch(
context: RequestHandlerContext,
request: IEnhancedEsSearchRequest
request: IEnhancedEsSearchRequest,
options?: ISearchOptions
): Promise<IEsSearchResponse> {
let esResponse;
let promise: TransportRequestPromise<any>;
const esClient = context.core.elasticsearch.client.asCurrentUser;
const uiSettingsClient = await context.core.uiSettings.client;

Expand All @@ -89,14 +91,17 @@ export const enhancedEsSearchStrategyProvider = (
...request.params,
});

esResponse = await esClient.asyncSearch.submit(submitOptions);
promise = esClient.asyncSearch.submit(submitOptions);
} else {
esResponse = await esClient.asyncSearch.get({
promise = esClient.asyncSearch.get({
id: request.id,
...toSnakeCase(asyncOptions),
});
}

// Temporary workaround until https://github.com/elastic/elasticsearch-js/issues/1297
if (options?.abortSignal) options.abortSignal.addEventListener('abort', () => promise.abort());
const esResponse = await promise;
const { id, response, is_partial: isPartial, is_running: isRunning } = esResponse.body;
return {
id,
Expand All @@ -109,7 +114,8 @@ export const enhancedEsSearchStrategyProvider = (

const rollupSearch = async function (
context: RequestHandlerContext,
request: IEnhancedEsSearchRequest
request: IEnhancedEsSearchRequest,
options?: ISearchOptions
): Promise<IEsSearchResponse> {
const esClient = context.core.elasticsearch.client.asCurrentUser;
const uiSettingsClient = await context.core.uiSettings.client;
Expand All @@ -123,13 +129,17 @@ export const enhancedEsSearchStrategyProvider = (
...params,
});

const esResponse = await esClient.transport.request({
const promise = esClient.transport.request({
method,
path,
body,
querystring,
});

// Temporary workaround until https://github.com/elastic/elasticsearch-js/issues/1297
if (options?.abortSignal) options.abortSignal.addEventListener('abort', () => promise.abort());
const esResponse = await promise;

const response = esResponse.body as SearchResponse<any>;
return {
rawResponse: response,
Expand Down