aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2023-02-17 15:52:40 +0100
committerGitHub <noreply@github.com>2023-02-17 15:52:40 +0100
commit9caedde5abd992cf5399046843c13244663f8967 (patch)
tree414f39dcf80f34baa092b5137a02b4171f8bf7af
parent8613fd8b9deaa736f25d0271f808e178568eb1fe (diff)
parent84f385cd28eeb79e111de077ddf7687130452348 (diff)
Merge pull request #26085 from vespa-engine/freva/pretty-abort-message
Use Principal::getName instead of toString() in run abort message
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java2
1 files changed, 1 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 e3c7dc79575..ce60e0054c4 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
@@ -218,7 +218,7 @@ class JobControllerApiHandlerHelper {
Cursor responseObject = slime.setObject();
Optional<Run> run = jobs.last(id, type).flatMap(last -> jobs.active(last.id()));
if (run.isPresent()) {
- jobs.abort(run.get().id(), "aborted by " + request.getJDiscRequest().getUserPrincipal());
+ jobs.abort(run.get().id(), "aborted by " + request.getJDiscRequest().getUserPrincipal().getName());
responseObject.setString("message", "Aborting " + run.get().id());
}
else