Merge pull request #18160 from vespa-engine/hmusum/remove-stack-trace-from-exception

Rethrow with exception message only

2 files changed, 8 insertions, 2 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java
index e9fe669269c..8f71d4f5061 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
 /**
@@ -13,4 +13,8 @@ public class ApplicationLockException extends RuntimeException {
         super(e);
     }
 
+    public ApplicationLockException(String message) {
+        super(message);
+    }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Applications.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Applications.java
index ccd5af1cb64..fe363bf3786 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Applications.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Applications.java
@@ -2,8 +2,8 @@
 package com.yahoo.vespa.hosted.provision.applications;
 
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.ApplicationLockException;
 import com.yahoo.config.provision.ApplicationTransaction;
-import com.yahoo.config.provision.ProvisionLock;
 import com.yahoo.transaction.Mutex;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.vespa.hosted.provision.persistence.CuratorDatabaseClient;
@@ -28,6 +28,8 @@ public class Applications {
         for (ApplicationId id : ids()) {
             try (Mutex lock = db.lock(id)) {
                 get(id).ifPresent(application -> put(application, lock));
+            } catch (ApplicationLockException e) {
+                throw new ApplicationLockException(e.getMessage());  // No need for stack trace here
             }
         }
     }