Skip to content

Commit 371f5d7

Browse files
[FEATURE][ML] Fix a few minor issues after merging master
1 parent e869b60 commit 371f5d7

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRunAnalyticsAction.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ public TransportRunAnalyticsAction(ThreadPool threadPool, TransportService trans
8787
@Override
8888
protected void doExecute(Task task, RunAnalyticsAction.Request request, ActionListener<AcknowledgedResponse> listener) {
8989
DiscoveryNode localNode = clusterService.localNode();
90-
if (isMlNode(localNode)) {
90+
if (MachineLearning.isMlNode(localNode)) {
9191
reindexDataframeAndStartAnalysis(request.getIndex(), listener);
9292
return;
9393
}
9494

9595
ClusterState clusterState = clusterService.state();
9696
for (DiscoveryNode node : clusterState.getNodes()) {
97-
if (isMlNode(node)) {
97+
if (MachineLearning.isMlNode(node)) {
9898
transportService.sendRequest(node, actionName, request,
9999
new ActionListenerResponseHandler<>(listener, inputStream -> {
100100
AcknowledgedResponse response = new AcknowledgedResponse();
@@ -107,12 +107,6 @@ protected void doExecute(Task task, RunAnalyticsAction.Request request, ActionLi
107107
listener.onFailure(ExceptionsHelper.badRequestException("No ML node to run on"));
108108
}
109109

110-
private boolean isMlNode(DiscoveryNode node) {
111-
Map<String, String> nodeAttributes = node.getAttributes();
112-
String enabled = nodeAttributes.get(MachineLearning.ML_ENABLED_NODE_ATTR);
113-
return Boolean.valueOf(enabled);
114-
}
115-
116110
private void reindexDataframeAndStartAnalysis(String index, ActionListener<AcknowledgedResponse> listener) {
117111
final String destinationIndex = index + "_copy";
118112

0 commit comments

Comments
 (0)