honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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@bf0d9e0176
This commit is contained in:
David Roberts 2017-02-23 11:13:58 +00:00 committed by GitHub
parent d3d73ca095
commit 33b10970ee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java
View File

@ -34,7 +34,10 @@ public class MachineLearningFeatureSet implements XPackFeatureSet {
this.licenseState = licenseState; this.licenseState = licenseState;
Map<String, Object> nativeCodeInfo = NativeController.UNKNOWN_NATIVE_CODE_INFO; 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 // 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 { try {
NativeController nativeController = NativeControllerHolder.getNativeController(settings); NativeController nativeController = NativeControllerHolder.getNativeController(settings);
if (nativeController != null) { if (nativeController != null) {