Use keep_on_completion conditionally

elastic · Jul 13, 2021 · 9766368 · 9766368
1 parent f567031
commit 9766368
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
@@ -86,6 +86,31 @@ describe('request utils', () => {
  });
  expect(params).toHaveProperty('keep_alive', '1m');
  });
+
+ test('Uses `keep_on_completion` if enabled', async () => {
+ const mockUiSettingsClient = getMockUiSettingsClient({
+ [UI_SETTINGS.SEARCH_INCLUDE_FROZEN]: false,
+ });
+ const mockConfig = getMockSearchSessionsConfig({});
+ const params = await getDefaultAsyncSubmitParams(mockUiSettingsClient, mockConfig, {
+ sessionId: 'foo',
+ });
+ expect(params).toHaveProperty('keep_on_completion', true);
+ });
+
+ test('Does not use `keep_on_completion` if disabled', async () => {
+ const mockUiSettingsClient = getMockUiSettingsClient({
+ [UI_SETTINGS.SEARCH_INCLUDE_FROZEN]: false,
+ });
+ const mockConfig = getMockSearchSessionsConfig({
+ defaultExpiration: moment.duration(3, 'd'),
+ enabled: false,
+ });
+ const params = await getDefaultAsyncSubmitParams(mockUiSettingsClient, mockConfig, {
+ sessionId: 'foo',
+ });
+ expect(params).toHaveProperty('keep_on_completion', false);
+ });
  });
 
  describe('getDefaultAsyncGetParams', () => {

diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
@@ -51,9 +51,12 @@ export async function getDefaultAsyncSubmitParams(
  const keepAlive = searchSessionsConfig?.enabled
  ? `${searchSessionsConfig.defaultExpiration.asMilliseconds()}ms`
  : '1m';
+
+ // Always return an ID, even if the request completes quickly
+ const keepOnCompletion = searchSessionsConfig?.enabled && !!options.sessionId;
  return {
  batched_reduce_size: 64,
- keep_on_completion: !!options.sessionId, // Always return an ID, even if the request completes quickly
+ keep_on_completion: keepOnCompletion,
  ...getDefaultAsyncGetParams(options),
  ...(await getIgnoreThrottled(uiSettingsClient)),
  ...(await getDefaultSearchParams(uiSettingsClient)),