Abort server-side connection to ES

elastic · Nov 27, 2019 · 24cee09 · 24cee09
1 parent 9916cdf
commit 24cee09
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js b/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js
@@ -18,6 +18,7 @@
  */
 
 import { get, map } from 'lodash';
+import { abortableRequestHandler } from '../../../../../elasticsearch/lib/abortable_request_handler';
 
 export function registerValueSuggestions(server) {
   const serverConfig = server.config();
@@ -26,7 +27,7 @@ export function registerValueSuggestions(server) {
   server.route({
     path: '/api/kibana/suggestions/values/{index}',
     method: ['POST'],
-    handler: async function (req) {
+    handler: abortableRequestHandler(async function (signal, req) {
       const { index } = req.params;
       const { field: fieldName, query, boolFilter } = req.payload;
       const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
@@ -46,7 +47,7 @@ export function registerValueSuggestions(server) {
       );
 
       try {
-        const response = await callWithRequest(req, 'search', { index, body });
+        const response = await callWithRequest(req, 'search', { index, body }, { signal });
         const buckets = get(response, 'aggregations.suggestions.buckets')
           || get(response, 'aggregations.nestedSuggestions.suggestions.buckets')
           || [];
@@ -55,7 +56,7 @@ export function registerValueSuggestions(server) {
       } catch (error) {
         throw server.plugins.elasticsearch.handleESError(error);
       }
-    },
+    }),
   });
 }