Skip to content

[8.19] Fix that gap can be stuck "in-progress" (#221473) #224177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkhristinin merged 1 commit into from
Jun 17, 2025
Merged

[8.19] Fix that gap can be stuck "in-progress" (#221473) #224177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions x-pack/platform/plugins/shared/alerting/server/task_runner/ad_hoc_task_runner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,9 +902,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),
Expand Down Expand Up @@ -983,7 +988,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({
Expand Down Expand Up @@ -1045,7 +1050,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({
Expand Down Expand Up @@ -1107,7 +1112,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({
Expand Down Expand Up @@ -1171,7 +1176,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({
Expand Down Expand Up @@ -1328,7 +1333,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({
Expand Down Expand Up @@ -1477,7 +1482,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({
Expand Down
6 changes: 3 additions & 3 deletions x-pack/platform/plugins/shared/alerting/server/task_runner/ad_hoc_task_runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,17 +625,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(
Expand Down