From bf111dde7e318a17baf9a6273e2dd16bf80737bd Mon Sep 17 00:00:00 2001
From: Dimitris Athanasiou <dimitris@elastic.co>
Date: Fri, 7 Apr 2017 16:55:10 +0100
Subject: [PATCH] [ML] Add notification when no suitable nodes exist to
 allocate job (elastic/x-pack-elasticsearch#1006)

Relates elastic/x-pack-elasticsearch#878

Original commit: elastic/x-pack-elasticsearch@5a96484662fd438bb02331894a693ea50e7d89fe
---
 .../org/elasticsearch/xpack/ml/action/OpenJobAction.java  | 8 +++++---
 .../xpack/ml/action/StartDatafeedAction.java              | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
index 44d5aef44be..3d12f85da42 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java
@@ -405,8 +405,10 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
                 OpenJobAction.validate(request.getJobId(), mlMetadata, tasks);
                 Assignment assignment = selectLeastLoadedMlNode(request.getJobId(), clusterState, maxConcurrentJobAllocations, logger);
                 if (assignment.getExecutorNode() == null) {
-                    throw new ElasticsearchStatusException("cannot open job [" + request.getJobId() + "], no suitable nodes found, " +
-                            "allocation explanation [{}]", RestStatus.TOO_MANY_REQUESTS, assignment.getExplanation());
+                    String msg = "Could not open job because no suitable nodes were found, allocation explanation ["
+                            + assignment.getExplanation() + "]";
+                    auditor.warning(request.getJobId(), msg);
+                    throw new ElasticsearchStatusException(msg, RestStatus.TOO_MANY_REQUESTS);
                 }
             } else {
                 throw LicenseUtils.newComplianceException(XPackPlugin.MACHINE_LEARNING);
@@ -447,7 +449,7 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
                         auditor.warning(jobId, "No node found to open job. Reasons [" + assignment.getExplanation() + "]");
                     } else {
                         DiscoveryNode node = state.nodes().get(assignment.getExecutorNode());
-                        auditor.info(jobId, "Found node [" + node + "] to open job");
+                        auditor.info(jobId, "Opening job on node [" + node.toString() + "]");
                     }
                 }
             });
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java
index 684a5ebb23b..6dd56941b60 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java
@@ -465,7 +465,7 @@ public class StartDatafeedAction
                                 assignment.getExplanation() + "]");
                     } else {
                         DiscoveryNode node = state.nodes().get(assignment.getExecutorNode());
-                        auditor.info(jobId, "Found node [" + node + "] to start datafeed [" + datafeedId + "]");
+                        auditor.info(jobId, "Starting datafeed [" + datafeedId + "] on node [" + node + "]");
                     }
                 }
             });