[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
@@ -34,7 +34,10 @@ public class MachineLearningFeatureSet implements XPackFeatureSet {
this.licenseState = licenseState;
Map<String, Object> 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) {
