maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[ML] Adjusting module jobs model memory limit (#45502)

Browse source
This commit is contained in:
James Gowdy 2019-09-12 18:12:40 +01:00 committed by GitHub
parent e0fdce6356
commit b5fc70e013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
x-pack/legacy/plugins/ml/server/models/data_recognizer/data_recognizer.js
View file

@ -8,6 +8,8 @@
import fs from 'fs';
import Boom from 'boom';
import numeral from '@elastic/numeral';
import { idx } from '@kbn/elastic-idx';
import { merge } from 'lodash';
import { getLatestDataOrBucketTimestamp, prefixDatafeedId } from '../../../common/util/job_utils';
import { mlLog } from '../../client/log';
@ -308,6 +310,7 @@ export class DataRecognizer {
this.applyDatafeedConfigOverrides(moduleConfig, datafeedOverrides, jobPrefix);
this.updateDatafeedIndices(moduleConfig);
this.updateJobUrlIndexPatterns(moduleConfig);
await this.updateModelMemoryLimits(moduleConfig);
// create the jobs
if (moduleConfig.jobs && moduleConfig.jobs.length) {
@ -768,6 +771,30 @@ export class DataRecognizer {
}
}
// ensure the model memory limit for each job is not greater than
// the max model memory setting for the cluster
async updateModelMemoryLimits(moduleConfig) {
const { limits } = await this.callWithRequest('ml.info');
const maxMml = limits.max_model_memory_limit;
if (maxMml !== undefined) {
const maxBytes = numeral(maxMml.toUpperCase()).value();
if (Array.isArray(moduleConfig.jobs)) {
moduleConfig.jobs.forEach((job) => {
const mml = idx(job, _ => _.config.analysis_limits.model_memory_limit);
if (mml !== undefined) {
const mmlBytes = numeral(mml.toUpperCase()).value();
if (mmlBytes > maxBytes) {
// if the job's mml is over the max,
// so set the jobs mml to be the max
job.config.analysis_limits.model_memory_limit = maxMml;
}
}
});
}
}
}
// check the kibana saved searches JSON in the module to see if they contain INDEX_PATTERN_ID
// which needs replacement
doSavedObjectsContainIndexPatternId(moduleConfig) {