diff options
author | Harald Musum <musum@yahooinc.com> | 2021-10-13 09:27:56 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-10-13 09:27:56 +0200 |
commit | f4d482c509c00aa960b74de4e24f7c9e8b9eb361 (patch) | |
tree | 8e58defaa15e5d84fd66d933f13e3aa6e36c7f14 /node-repository | |
parent | 47b71a8b24956b37bc417175d17c86992f09c003 (diff) |
Move ActivationConflictException to config-provisioning
Move, so that it can be used in MaintenanceDeployment
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java index 9cffc361444..ff696e727fa 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java @@ -6,6 +6,7 @@ import com.yahoo.config.provision.ApplicationLockException; import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.Deployment; import com.yahoo.config.provision.TransientException; +import com.yahoo.config.provision.exception.ActivationConflictException; import com.yahoo.jdisc.Metric; import com.yahoo.transaction.Mutex; import com.yahoo.vespa.hosted.provision.Node; @@ -95,7 +96,7 @@ class MaintenanceDeployment implements Closeable { if ( ! isValid()) return Optional.empty(); try { return Optional.of(step.get()); - } catch (TransientException e) { + } catch (TransientException | ActivationConflictException e) { metric.add("maintenanceDeployment.transientFailure", 1, metric.createContext(Map.of())); log.log(Level.INFO, "Failed to maintenance deploy " + application + " with a transient error: " + Exceptions.toMessageString(e)); |