[8.18] Fix that gap can be stuck "in-progress" (elastic#221473) (elastic#224176)

# Backport

This will backport the following commits from `main` to `8.18`:
 - Fix that gap can be stuck "in-progress" (elastic#221473) (dfd783e)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Khristinin
Nikita","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-06-17T06:47:01Z","message":"Fix
that gap can be stuck \"in-progress\" (elastic#221473)\n\n##
Summary\n\n\n[[Issue](https://github.com/elastic/kibana/issues/221111)](https://github.com/elastic/kibana/issues/221111)\n\nGaps
can get stuck in the `in-progress` state if a rule is\nbackfill-executed
with failures.\n\n### Current behavior:\n\nLet's say we have a gap from
`12:00–13:00`.\n\nWhen the gap is initially detected, it has the
following state:\n\n```\nfilled_intervals: []\nunfilled_intervals:
[12:00–13:00]\nin_progress_intervals: []\n```\n\nWhen a backfill starts,
we set `in_progress_intervals` to the range that\noverlaps with the
backfill. We also remove that range
from\n`unfilled_intervals`:\n\n```\nfilled_intervals:
[]\nunfilled_intervals: []\nin_progress_intervals:
[12:00–13:00]\n```\n\nAfter the backfill is successfully executed, we
move the range to\n`filled_intervals` and clear
`in_progress_intervals`:\n\n```\nfilled_intervals:
[12:00–13:00]\nunfilled_intervals: []\nin_progress_intervals:
[]\n```\n\nHowever, if the backfill fails, we want to remove the range
from\n`in_progress_intervals` and move it back to `unfilled_intervals`.
The\nproblem is that we cannot simply do this because there might be
other\noverlapping backfills still in progress for the same gap. In the
case of\na successful execution, this isn’t an issue, as the range is
moved to\n`filled_intervals`.\n\nWhen a backfill fails, we refetch all
overlapping backfills for the gap\nto recalculate the
`in_progress_intervals`.\n\n### Problem\n\nIn the current
implementation, we're updating the gaps **before**\ndeleting the failed
backfill. This causes the recalculated\n`in_progress_intervals` to still
include the failed backfill’s range,\nresulting in a stale state.\n\n###
Fix\n\nWe should **first delete** the failed backfill, and **then**
update the\ngap. This ensures that the recalculated
`in_progress_intervals` reflect\nonly the remaining active
backfills.\n\n---------\n\nCo-authored-by: Elastic Machine
<[email protected]>","sha":"dfd783e12a4046758be75c05bbe36bc105710296"},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[]}]
BACKPORT-->

Co-authored-by: Khristinin Nikita <[email protected]>
Co-authored-by: Elastic Machine <[email protected]>

Author: 3 people

x-pack/platform/plugins/shared/alerting/server/task_runner/ad_hoc_task_runner.test.ts

@@ -888,9 +888,14 @@ describe('Ad Hoc Task Runner', () => {
     expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
       AD_HOC_RUN_SAVED_OBJECT_TYPE,
       'abc',
-      { refresh: false, namespace: undefined }
+      { refresh: true, namespace: undefined }
     );
 
+    // Verify that updateGaps was called after delete
+    const deleteCallOrder = internalSavedObjectsRepository.delete.mock.invocationCallOrder[0];
+    const updateGapsCallOrder = mockUpdateGaps.mock.invocationCallOrder[0];
+    expect(updateGapsCallOrder).toBeGreaterThan(deleteCallOrder);
+
     expect(mockUpdateGaps).toHaveBeenCalledWith({
       ruleId: RULE_ID,
       start: new Date(mockedAdHocRunSO.attributes.start),
@@ -969,7 +974,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         'abc',
-        { refresh: false, namespace: undefined }
+        { refresh: true, namespace: undefined }
       );
 
       testAlertingEventLogCalls({
@@ -1031,7 +1036,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         'abc',
-        { refresh: false, namespace: undefined }
+        { refresh: true, namespace: undefined }
       );
 
       testAlertingEventLogCalls({
@@ -1093,7 +1098,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         'abc',
-        { refresh: false, namespace: undefined }
+        { refresh: true, namespace: undefined }
       );
 
       testAlertingEventLogCalls({
@@ -1157,7 +1162,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         'abc',
-        { refresh: false, namespace: undefined }
+        { refresh: true, namespace: undefined }
       );
 
       testAlertingEventLogCalls({
@@ -1314,7 +1319,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         'abc',
-        { refresh: false, namespace: undefined }
+        { refresh: true, namespace: undefined }
       );
 
       testAlertingEventLogCalls({
@@ -1463,7 +1468,7 @@ describe('Ad Hoc Task Runner', () => {
       expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         mockedAdHocRunSO.id,
-        { namespace: undefined, refresh: false }
+        { namespace: undefined, refresh: true }
       );
 
       testAlertingEventLogCalls({

x-pack/platform/plugins/shared/alerting/server/task_runner/ad_hoc_task_runner.ts

@@ -620,17 +620,17 @@ export class AdHocTaskRunner implements CancellableTask {
   async cleanup() {
     if (!this.shouldDeleteTask) return;
 
-    await this.updateGapsAfterBackfillComplete();
-
     try {
       await this.internalSavedObjectsRepository.delete(
         AD_HOC_RUN_SAVED_OBJECT_TYPE,
         this.taskInstance.params.adHocRunParamsId,
         {
-          refresh: false,
+          refresh: true,
           namespace: this.context.spaceIdToNamespace(this.taskInstance.params.spaceId),
         }
       );
+
+      await this.updateGapsAfterBackfillComplete();
     } catch (e) {
       // Log error only, we shouldn't fail the task because of an error here (if ever there's retry logic)
       this.logger.error(