From 33b10970eeed9f56ec36920d02ccc7bd54d3a407 Mon Sep 17 00:00:00 2001 From: David Roberts Date: Thu, 23 Feb 2017 11:13:58 +0000 Subject: [PATCH] [ML] Temporary workaround to make some non-ml integration tests work (elastic/x-pack-elasticsearch#630) This will be replaced with a better solution when elastic/x-pack-elasticsearch#566 is implemented Original commit: elastic/x-pack-elasticsearch@bf0d9e0176e9b18502c051f906d642e34ad8646e --- .../elasticsearch/xpack/ml/MachineLearningFeatureSet.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java index 4711dd6ed33..2217bb4d662 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java @@ -34,7 +34,10 @@ public class MachineLearningFeatureSet implements XPackFeatureSet { this.licenseState = licenseState; Map nativeCodeInfo = NativeController.UNKNOWN_NATIVE_CODE_INFO; // Don't try to get the native code version in the transport client - the controller process won't be running - if (XPackPlugin.transportClientMode(settings) == false) { + if (XPackPlugin.transportClientMode(settings) == false + // NORELEASE: temporary workaround to make some non-ml integration tests + // work - needs replacing before machine learning is enabled by default + && enabled) { try { NativeController nativeController = NativeControllerHolder.getNativeController(settings); if (nativeController != null) {