Merge pull request #7938 from vespa-engine/hmusum/report-if-job-not-triggered

Report if job was not triggered

2 files changed, 6 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index d90f565b90e..3eb6b214b52 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -364,7 +364,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             String triggered = controller.applications().deploymentTrigger()
                                          .forceTrigger(id, type, request.getJDiscRequest().getUserPrincipal().getName())
                                          .stream().map(JobType::jobName).collect(joining(", "));
-            return new MessageResponse("Triggered " + triggered + " for " + id);
+            return new MessageResponse(triggered.isEmpty() ? "Job " + type.jobName() + " for " + id + " not triggered"
+                                                           : "Triggered " + triggered + " for " + id);
     }
 
     private HttpResponse pause(ApplicationId id, JobType type) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
index 14bb89520d7..05f889a7018 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
@@ -91,7 +91,10 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
 
         Slime slime = new Slime();
         Cursor cursor = slime.setObject();
-        cursor.setString("message", "Triggered " + triggered + " for " + id);
+        String message = triggered.isEmpty()
+                ? "Job " + jobType.jobName() + " for " + id + " not triggered"
+                : "Triggered " + triggered + " for " + id;
+        cursor.setString("message", message);
         return new SlimeJsonResponse(slime);
     }