github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

use retry on updateAPIKey conflict (#151802)

Browse source 
fixes: #140867

Our task manager collects all the due tasks, executes their rules and
actions and updates the tasks at the end.
As executing rule and actions may take long time and not fetching the
tasks again before saving, updating a rule and task sometimes creates
209 conflict error.

To avoid this, i disabled the rule before updating it and waited for 3
sec to be sure that the ongoing task execution cycle is done. Then i
enabled the task back again expected it to be running successfully

flaky test runner (There is one failure but it's irrelevant):

https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2008#_
This commit is contained in:
Ersin Erdal 2023-03-24 18:09:09 +01:00 • committed by GitHub
parent 422f6e837f
commit e8944b5a46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/task_manager/server/task_pool.ts
View file

@ -168,7 +168,7 @@ export class TaskPool {
// we asssume the underlying task has been deleted while it was running
// so we will log this as a debug, rather than a warn
const errorLogLine = `Task ${taskRunner.toString()} failed in attempt to run: ${
err.message
err.message || err.error.message
}`;
if (isTaskSavedObjectNotFoundError(err, taskRunner.id)) {
this.logger.debug(errorLogLine);

50
x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/alerting/rbac_legacy.ts
View file

@ -56,8 +56,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
),
};
// FLAKY: https://github.com/elastic/kibana/issues/140867
describe.skip('alerts', () => {
describe('alerts', () => {
const authorizationIndex = '.kibana-test-authorization';
const objectRemover = new ObjectRemover(supertest);
@ -103,21 +102,27 @@ export default function alertTests({ getService }: FtrProviderContext) {
// these cases were invalid pre 7.10.0 and remain invalid post 7.10.0
break;
case 'space_1_all at space1':
case 'superuser at space1':
case 'space_1_all_with_restricted_fixture at space1':
case 'superuser at space1':
await resetTaskStatus(migratedAlertId);
await ensureLegacyAlertHasBeenMigrated(migratedAlertId);
await updateMigratedAlertToUseApiKeyOfCurrentUser(migratedAlertId);
await rescheduleTask(migratedAlertId);
await ensureAlertIsRunning();
await alertUtils.disable(migratedAlertId);
await updateAlertSoThatItIsNoLongerLegacy(migratedAlertId);
// update alert as user with privileges - so it is no longer a legacy alert
const updatedKeyResponse = await alertUtils.getUpdateApiKeyRequest(migratedAlertId);
expect(updatedKeyResponse.statusCode).to.eql(204);
await retry.try(async () => {
const updatedKeyResponse = await alertUtils.getUpdateApiKeyRequest(migratedAlertId);
expect(updatedKeyResponse.statusCode).to.eql(204);
});
// As we update the task multiple times in this test case, we might be updating the one already picked up by the task manager.
// To avoid 409 conflict error, we disable the rule above before updating and wait for 3 seconds
// after updating it to be sure that one task manager cycle is done. So we are not updating a task that is in progress.
await new Promise((resolve) => setTimeout(resolve, 3000));
await alertUtils.enable(migratedAlertId);
await ensureAlertIsRunning();
break;
case 'global_read at space1':
@ -125,6 +130,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
await ensureLegacyAlertHasBeenMigrated(migratedAlertId);
await updateMigratedAlertToUseApiKeyOfCurrentUser(migratedAlertId);
await rescheduleTask(migratedAlertId);
await ensureAlertIsRunning();
@ -148,9 +154,9 @@ export default function alertTests({ getService }: FtrProviderContext) {
await ensureLegacyAlertHasBeenMigrated(migratedAlertId);
await updateMigratedAlertToUseApiKeyOfCurrentUser(migratedAlertId);
await rescheduleTask(migratedAlertId);
await ensureAlertIsRunning();
await updateAlertSoThatItIsNoLongerLegacy(migratedAlertId);
// attempt to update alert as user with no Actions privileges - as it is no longer a legacy alert
@ -202,7 +208,9 @@ export default function alertTests({ getService }: FtrProviderContext) {
expect(swapResponse.body.attributes.meta.versionApiKeyLastmodified).to.eql(
'pre-7.10.0'
);
}
async function rescheduleTask(alertId: string) {
// Get scheduled task id
const getResponse = await supertestWithoutAuth
.get(`${getUrlPrefix(space.id)}/api/alerting/rule/${alertId}`)
@ -267,16 +275,20 @@ export default function alertTests({ getService }: FtrProviderContext) {
async function updateAlertSoThatItIsNoLongerLegacy(alertId: string) {
// update the alert as super user (to avoid privilege limitations) so that it is no longer a legacy alert
await alertUtils.updateAlwaysFiringAction({
alertId,
actionId: MIGRATED_ACTION_ID,
user: Superuser,
reference,
overwrites: {
name: 'Updated Alert',
schedule: { interval: '2s' },
throttle: '2s',
},
await retry.try(async () => {
const response = await alertUtils.updateAlwaysFiringAction({
alertId,
actionId: MIGRATED_ACTION_ID,
user: Superuser,
reference,
overwrites: {
name: 'Updated Alert',
schedule: { interval: '2s' },
throttle: '2s',
},
});
expect(response.statusCode).to.eql(200);
});
}
});