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

[ML] Fix flaky update_groups api test (#161326)

Browse source 
Related to https://github.com/elastic/kibana/issues/161324 and
https://github.com/elastic/kibana/issues/160370
Flaky test runner
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2649

I believe the problem lies with the function `cleanMLSavedObjects` only
cleaning up saved objects in the default space and not in any other of
the spaces which jobs or trained models may have been added to.
This causes an intermittent clash where a job's saved object already
exists, but is in a different space. I don't know why this doesn't fail
on every run.
The fix is to update `cleanMLSavedObjects` so it can take a list of
additional space IDs to also clean. Any test which adds jobs or trained
models to spaces other than `default` need to call this function and
supply the list of space IDs it is using.
I've updated every test I could find in this PR.
This commit is contained in:
James Gowdy 2023-07-18 17:29:42 +01:00 • committed by GitHub
parent 41a8a1db01
commit 5548e12010
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
View file

@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.closeAnomalyDetectionJob(jobIdSpace1);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/anomaly_detectors/delete_with_spaces.ts
View file

@ -46,7 +46,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
View file

@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.closeAnomalyDetectionJob(jobIdSpace1);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts
View file

@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
View file

@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
await ml.api.closeAnomalyDetectionJob(jobIdSpace1);
await ml.api.closeAnomalyDetectionJob(jobIdSpace2);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/jobs/delete_jobs_spaces.ts
View file

@ -53,7 +53,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
View file

@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
await ml.api.deleteAnomalyDetectionJobES(jobIdSpace1);
await ml.api.deleteAnomalyDetectionJobES(jobIdSpace2);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

4
x-pack/test/api_integration/apis/ml/jobs/jobs.ts
View file

@ -16,6 +16,7 @@ export default ({ getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
const supertest = getService('supertestWithoutAuth');
const ml = getService('ml');
const spacesService = getService('spaces');
const idSpace1 = 'space1';
@ -95,6 +96,7 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
await ml.testResources.setKibanaTimeZoneToUTC();
await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
for (const job of testSetupJobConfigs) {
await ml.api.createAnomalyDetectionJob(job);
@ -123,7 +125,9 @@ export default ({ getService }: FtrProviderContext) => {
});
after(async () => {
await spacesService.delete(idSpace1);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
});
it('returns expected list of combined jobs with stats in default space', async () => {

3
x-pack/test/api_integration/apis/ml/jobs/reset.ts
View file

@ -52,8 +52,7 @@ export default ({ getService }: FtrProviderContext) => {
[MULTI_METRIC_JOB_CONFIG.job_id]: { reset: true, task: 'cannot be predicted' },
};
// Failing: See https://github.com/elastic/kibana/issues/160370
describe.skip('reset_jobs', function () {
describe('reset_jobs', function () {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');

2
x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
View file

@ -90,7 +90,7 @@ export default ({ getService }: FtrProviderContext) => {
await ml.api.deleteAnomalyDetectionJobES(jobIdSpace1);
await ml.api.deleteAnomalyDetectionJobES(jobIdSpace2);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

1
x-pack/test/api_integration/apis/ml/jobs/update_groups.ts
View file

@ -70,6 +70,7 @@ export default ({ getService }: FtrProviderContext) => {
after(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
});
it('returns expected list of groups after update', async () => {

4
x-pack/test/api_integration/apis/ml/results/get_anomaly_search.ts
View file

@ -68,10 +68,10 @@ export default ({ getService }: FtrProviderContext) => {
});
after(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await spacesService.delete(idSpace1);
await spacesService.delete(idSpace2);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
});
it('should see results in current space', async () => {

4
x-pack/test/api_integration/apis/ml/saved_objects/remove_from_current_space.ts
View file

@ -69,10 +69,10 @@ export default ({ getService }: FtrProviderContext) => {
});
after(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await spacesService.delete(idSpace1);
await spacesService.delete(idSpace2);
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
});
it('should remove AD job from current space', async () => {

2
x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
View file

@ -61,7 +61,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/api_integration/apis/ml/saved_objects/update_trained_model_spaces.ts
View file

@ -55,7 +55,7 @@ export default ({ getService }: FtrProviderContext) => {
afterEach(async () => {
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
});
after(async () => {

2
x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts
View file

@ -52,8 +52,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await ml.api.deleteAnomalyDetectionJobES(jobId);
}
await spacesService.delete(idSpace1);
await ml.testResources.cleanMLSavedObjects();
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects();
await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
});

2
x-pack/test/functional/apps/ml/stack_management_jobs/manage_spaces.ts
View file

@ -135,8 +135,8 @@ export default function ({ getService }: FtrProviderContext) {
await spacesService.delete(spaceId);
}
}
await ml.testResources.cleanMLSavedObjects();
await ml.api.cleanMlIndices();
await ml.testResources.cleanMLSavedObjects([spaceIds.idSpace1]);
await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
});

28
x-pack/test/functional/services/ml/test_resources.ts
View file

@ -101,12 +101,14 @@ export function MachineLearningTestResourcesProvider(
log.debug(` > Not found`);
},
async getSavedObjectIdsByType(objectType: SavedObjectType): Promise<string[]> {
async getSavedObjectIdsByType(objectType: SavedObjectType, space?: string): Promise<string[]> {
const savedObjectIds: string[] = [];
log.debug(`Searching for '${objectType}' ...`);
const { body: findResponse, status } = await supertest
.get(`/api/saved_objects/_find?type=${objectType}&per_page=10000`)
.get(
`${space ? `/s/${space}` : ''}/api/saved_objects/_find?type=${objectType}&per_page=10000`
)
.set(getCommonRequestHeader('1'));
mlApi.assertResponseStatusCode(200, status, findResponse);
@ -514,17 +516,23 @@ export function MachineLearningTestResourcesProvider(
await this.assertSavedObjectExistsById(id, SavedObjectType.DASHBOARD);
},
async deleteMlSavedObjectByJobId(jobId: string, jobType: JobType) {
async deleteMlSavedObjectByJobId(jobId: string, jobType: JobType, space?: string) {
const savedObjectId = `${jobType}-${jobId}`;
await this.deleteSavedObjectById(savedObjectId, SavedObjectType.ML_JOB, true);
await this.deleteSavedObjectById(savedObjectId, SavedObjectType.ML_JOB, true, space);
},
async cleanMLSavedObjects() {
async cleanMLSavedObjects(additionalSpaces: string[] = []) {
// clean default space
await this.cleanMLJobSavedObjects();
await this.cleanMLTrainedModelsSavedObjects();
for (const space of additionalSpaces) {
await this.cleanMLJobSavedObjects(space);
await this.cleanMLTrainedModelsSavedObjects(space);
}
},
async cleanMLJobSavedObjects() {
async cleanMLJobSavedObjects(space?: string) {
log.debug('Deleting ML job saved objects ...');
const savedObjectIds = await this.getSavedObjectIdsByType(SavedObjectType.ML_JOB);
for (const id of savedObjectIds) {
@ -533,10 +541,11 @@ export function MachineLearningTestResourcesProvider(
log.debug('> ML job saved objects deleted.');
},
async cleanMLTrainedModelsSavedObjects() {
async cleanMLTrainedModelsSavedObjects(space?: string) {
log.debug('Deleting ML trained model saved objects ...');
const savedObjectIds = await this.getSavedObjectIdsByType(
SavedObjectType.ML_TRAINED_MODEL_SAVED_OBJECT_TYPE
SavedObjectType.ML_TRAINED_MODEL_SAVED_OBJECT_TYPE,
space
);
for (const id of savedObjectIds) {
if (mlApi.isInternalModelId(id)) {
@ -546,7 +555,8 @@ export function MachineLearningTestResourcesProvider(
await this.deleteSavedObjectById(
id,
SavedObjectType.ML_TRAINED_MODEL_SAVED_OBJECT_TYPE,
true
true,
space
);
}
log.debug('> ML trained model saved objects deleted.');