Rename configs

elastic · Feb 2, 2021 · fc29c7f · fc29c7f
1 parent a6491dd
commit fc29c7f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/x-pack/plugins/data_enhanced/config.ts b/x-pack/plugins/data_enhanced/config.ts
@@ -12,8 +12,8 @@ export const configSchema = schema.object({
       enabled: schema.boolean({ defaultValue: false }),
       pageSize: schema.number({ defaultValue: 10000 }),
       trackingInterval: schema.duration({ defaultValue: '10s' }),
-      completedTimeout: schema.duration({ defaultValue: '5m' }),
-      notTouchedTimeout: schema.duration({ defaultValue: '1m' }),
+      notTouchedTimeout: schema.duration({ defaultValue: '5m' }),
+      notTouchedInProgressTimeout: schema.duration({ defaultValue: '1m' }),
       maxUpdateRetries: schema.number({ defaultValue: 3 }),
       defaultExpiration: schema.duration({ defaultValue: '7d' }),
       management: schema.object({

diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.test.ts
@@ -22,8 +22,8 @@ describe('getSearchStatus', () => {
   const config: SearchSessionsConfig = {
     enabled: true,
     pageSize: 5,
-    notTouchedTimeout: moment.duration(1, 'm'),
-    completedTimeout: moment.duration(5, 'm'),
+    notTouchedInProgressTimeout: moment.duration(1, 'm'),
+    notTouchedTimeout: moment.duration(5, 'm'),
     maxUpdateRetries: 3,
     defaultExpiration: moment.duration(7, 'd'),
     trackingInterval: moment.duration(10, 's'),

diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_running_sessions.ts
@@ -37,15 +37,15 @@ function isSessionStale(
   logger: Logger
 ) {
   const curTime = moment();
-  // Delete if a running session wasn't polled for in the last notTouchedTimeout OR
-  // if a completed \ errored \ canceled session wasn't saved for within completedTimeout
+  // Delete if a running session wasn't polled for in the last notTouchedInProgressTimeout OR
+  // if a completed \ errored \ canceled session wasn't saved for within notTouchedTimeout
   return (
     (session.attributes.status === SearchSessionStatus.IN_PROGRESS &&
       curTime.diff(moment(session.attributes.touched), 'ms') >
-        config.notTouchedTimeout.asMilliseconds()) ||
+        config.notTouchedInProgressTimeout.asMilliseconds()) ||
     (session.attributes.status !== SearchSessionStatus.IN_PROGRESS &&
       curTime.diff(moment(session.attributes.touched), 'ms') >
-        config.completedTimeout.asMilliseconds())
+        config.notTouchedTimeout.asMilliseconds())
   );
 }
 

diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
@@ -51,8 +51,8 @@ describe('SearchSessionService', () => {
         sessions: {
           enabled: true,
           pageSize: 10000,
-          notTouchedTimeout: moment.duration(1, 'm'),
-          completedTimeout: moment.duration(2, 'm'),
+          notTouchedInProgressTimeout: moment.duration(1, 'm'),
+          notTouchedTimeout: moment.duration(2, 'm'),
           maxUpdateRetries: MAX_UPDATE_RETRIES,
           defaultExpiration: moment.duration(7, 'd'),
           trackingInterval: moment.duration(10, 's'),

diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
@@ -31,7 +31,7 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi
         '--xpack.fleet.enabled=true',
         '--xpack.fleet.agents.pollingRequestTimeout=5000', // 5 seconds
         '--xpack.data_enhanced.search.sessions.enabled=true', // enable WIP send to background UI
-        '--xpack.data_enhanced.search.sessions.completedTimeout=15s', // shorten completedTimeout for quicker testing
+        '--xpack.data_enhanced.search.sessions.notTouchedTimeout=15s', // shorten notTouchedTimeout for quicker testing
         '--xpack.data_enhanced.search.sessions.trackingInterval=5s', // shorten trackingInterval for quicker testing
       ],
     },