aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-05-03 15:39:07 +0200
committerjonmv <venstad@gmail.com>2023-05-03 15:39:07 +0200
commita34ebf35c1f69276f3c018980ae24119a86b15b6 (patch)
tree4c8f9f4d483ecdf4842e61407ed0c34d27d0f1e0 /controller-server/src
parent82a9f98260716e813a0f4e7a81b55eddf995b872 (diff)
null delay cause when no jobs to run
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index de777475da2..956e7e755e5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -27,6 +27,7 @@ import com.yahoo.vespa.hosted.controller.deployment.ConvergenceSummary;
import com.yahoo.vespa.hosted.controller.deployment.DeploymentStatus;
import com.yahoo.vespa.hosted.controller.deployment.DeploymentStatus.DelayCause;
import com.yahoo.vespa.hosted.controller.deployment.DeploymentStatus.Readiness;
+import com.yahoo.vespa.hosted.controller.deployment.DeploymentStatus.StepType;
import com.yahoo.vespa.hosted.controller.deployment.JobController;
import com.yahoo.vespa.hosted.controller.deployment.JobStatus;
import com.yahoo.vespa.hosted.controller.deployment.Run;
@@ -292,7 +293,9 @@ class JobControllerApiHandlerHelper {
}
}
stepObject.setString("delayCause",
- switch (readiness.cause()) {
+ stepStatus.job().isPresent() && ! jobsToRun.containsKey(stepStatus.job().get())
+ ? (String) null
+ : switch (readiness.cause()) {
case none -> null;
case invalidPackage -> "invalidPackage";
case paused -> "paused";