From 051d9f6dceb3a6daa3a1d4085a7c7a654d982a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Mon, 13 Apr 2020 19:02:58 -0400
Subject: [PATCH] Fix task manager query to return tasks to retry (#63360)
 (#63405)

* Fix task manager query to also return tasks to retry

* Fix failing jest tests
---
 .../server/queries/mark_available_tasks_as_claimed.ts      | 7 ++++---
 x-pack/plugins/task_manager/server/task_store.test.ts      | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts b/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
index b0d9dc61c96675..8f7cc47f936b2b 100644
--- a/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
+++ b/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
@@ -11,7 +11,7 @@ import {
   RangeFilter,
   mustBeAllOf,
   MustCondition,
-  MustNotCondition,
+  BoolClauseWithAnyCondition,
 } from './query_clauses';
 
 export const TaskWithSchedule: ExistsFilter = {
@@ -54,15 +54,16 @@ export const IdleTaskWithExpiredRunAt: MustCondition<TermFilter | RangeFilter> =
   },
 };
 
-export const InactiveTasks: MustNotCondition<TermFilter | RangeFilter> = {
+// TODO: Fix query clauses to support this
+export const InactiveTasks: BoolClauseWithAnyCondition<any> = {
   bool: {
     must_not: [
       {
         bool: {
           should: [{ term: { 'task.status': 'running' } }, { term: { 'task.status': 'claiming' } }],
+          must: { range: { 'task.retryAt': { gt: 'now' } } },
         },
       },
-      { range: { 'task.retryAt': { gt: 'now' } } },
     ],
   },
 };
diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts
index 97794311fb3d25..4ecefcb7984eb4 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -407,9 +407,9 @@ describe('TaskStore', () => {
                               { term: { 'task.status': 'running' } },
                               { term: { 'task.status': 'claiming' } },
                             ],
+                            must: { range: { 'task.retryAt': { gt: 'now' } } },
                           },
                         },
-                        { range: { 'task.retryAt': { gt: 'now' } } },
                       ],
                     },
                   },
@@ -553,9 +553,9 @@ describe('TaskStore', () => {
                               { term: { 'task.status': 'running' } },
                               { term: { 'task.status': 'claiming' } },
                             ],
+                            must: { range: { 'task.retryAt': { gt: 'now' } } },
                           },
                         },
-                        { range: { 'task.retryAt': { gt: 'now' } } },
                       ],
                     },
                   },