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

[7.6] [ML] Fixes bucket span estimators loading of max_buckets setting (#59639) #59662

Merged
merged 8 commits into from
Mar 10, 2020
Merged

[7.6] [ML] Fixes bucket span estimators loading of max_buckets setting (#59639) #59662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4cd381b
[ML] Fixes bucket span estimators loading of max_buckets setting (#59…
jgowdyelastic Mar 9, 2020
1510497
fixing test
jgowdyelastic Mar 9, 2020
99adb3d
reverting test fix
jgowdyelastic Mar 9, 2020
b25379f
disabling test
jgowdyelastic Mar 10, 2020
cdb2d09
Merge branch '7.6' into backport/7.6/pr-59639
elasticmachine Mar 10, 2020
54baf19
disabling tests for error text
jgowdyelastic Mar 10, 2020
936e0ce
Merge branch 'backport/7.6/pr-59639' of github.com:jgowdyelastic/kiba…
jgowdyelastic Mar 10, 2020
e603cd3
removing tests
jgowdyelastic Mar 10, 2020
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
137 changes: 0 additions & 137 deletions .../legacy/plugins/ml/server/models/bucket_span_estimator/__tests__/bucket_span_estimator.js
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 deletions x-pack/legacy/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,21 @@ export function estimateBucketSpanFactory(callWithRequest, elasticsearchPlugin,
filterPath: '*.*max_buckets',
})
.then(settings => {
if (typeof settings !== 'object' || typeof settings.defaults !== 'object') {
if (typeof settings !== 'object') {
reject('Unable to retrieve cluster settings');
}

// search.max_buckets could exist in default, persistent or transient cluster settings
const maxBucketsSetting = (settings.defaults ||
settings.persistent ||
settings.transient ||
{})['search.max_buckets'];

if (maxBucketsSetting === undefined) {
reject('Unable to retrieve cluster setting search.max_buckets');
}

const maxBuckets = parseInt(settings.defaults['search.max_buckets']);
const maxBuckets = parseInt(maxBucketsSetting);

const runEstimator = (splitFieldValues = []) => {
const bucketSpanEstimator = new BucketSpanEstimator(
Expand Down