Skip to content
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

[ML] Fix flaky update_groups api test #161326

Merged
merged 15 commits into from
Jul 18, 2023
Merged

[ML] Fix flaky update_groups api test #161326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
41137ec
[ML] Fix flaky update_groups api test
jgowdyelastic Jul 6, 2023
ab07316
adding sync
jgowdyelastic Jul 6, 2023
de3b736
cleaning before running tests
jgowdyelastic Jul 6, 2023
8bbb23d
adding debug info
jgowdyelastic Jul 6, 2023
b075c84
spaces clean up
jgowdyelastic Jul 6, 2023
0447ade
more debug
jgowdyelastic Jul 6, 2023
5feb1cd
renaming var
jgowdyelastic Jul 7, 2023
da38519
removing debug code
jgowdyelastic Jul 7, 2023
0fc8da0
unskipping reset test
jgowdyelastic Jul 7, 2023
dd5a0c3
adding missing SO clean
jgowdyelastic Jul 7, 2023
f172f34
Merge branch 'main' into fix-update_groups-api-test
jgowdyelastic Jul 7, 2023
47a0174
Merge branch 'main' into fix-update_groups-api-test
jgowdyelastic Jul 17, 2023
1dbb273
cleaning up calls to cleanMLSavedObjects
jgowdyelastic Jul 17, 2023
271ce47
Merge branch 'main' into fix-update_groups-api-test
jgowdyelastic Jul 17, 2023
e4f441b
removing create space call
jgowdyelastic Jul 17, 2023
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
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/anomaly_detectors/delete_with_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/jobs/delete_jobs_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
4 changes: 4 additions & 0 deletions x-pack/test/api_integration/apis/ml/jobs/jobs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 () => {
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/api_integration/apis/ml/jobs/reset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
1 change: 1 addition & 0 deletions x-pack/test/api_integration/apis/ml/jobs/update_groups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/results/get_anomaly_search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/api_integration/apis/ml/saved_objects/remove_from_current_space.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/ml/saved_objects/update_trained_model_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});

Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ml/stack_management_jobs/manage_spaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
Expand Down
28 changes: 19 additions & 9 deletions x-pack/test/functional/services/ml/test_resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deleteSavedObjectById call in this method should pass through the space.

log.debug('Deleting ML job saved objects ...');
const savedObjectIds = await this.getSavedObjectIdsByType(SavedObjectType.ML_JOB);
for (const id of savedObjectIds) {
Expand All @@ -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)) {
Expand All @@ -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.');
Expand Down