[7.6] [ML] Fixes bucket span estimators loading of max_buckets setting (

#59639) (#59662) * [ML] Fixes bucket span estimators loading of max_buckets setting (#59639) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> * fixing test * reverting test fix * disabling test * disabling tests for error text * removing tests Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Mar 10, 2020 · 918cdd4 · 918cdd4
1 parent 78508b8
commit 918cdd4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 139 deletions.
diff --git a/.../legacy/plugins/ml/server/models/bucket_span_estimator/__tests__/bucket_span_estimator.js b/.../legacy/plugins/ml/server/models/bucket_span_estimator/__tests__/bucket_span_estimator.js
diff --git a/x-pack/legacy/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js b/x-pack/legacy/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js
@@ -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(