summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-10-31 11:07:03 +0100
committerHarald Musum <musum@yahooinc.com>2023-10-31 11:07:03 +0100
commit21c4c0ec0af0e08ff355f75f3e4103e8c6ffa9dd (patch)
tree4d8fbe533119db2dd35e41426e94ee392cfd4f47 /configserver
parent21ae78fadec5682c9151a3eacaa9d74d413b2e3d (diff)
Simplify
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index f1dd3e725a7..ae1215fd5aa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -132,13 +132,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
TimeoutBudget timeoutBudget = params.getTimeoutBudget();
timeoutBudget.assertNotTimedOut(() -> "Timeout exceeded when trying to activate '" + applicationId + "'");
- try {
- Activation activation = applicationRepository.activate(session, applicationId, tenant, params.force());
- waitForActivation(applicationId, timeoutBudget, activation);
- } catch (Exception e) {
- throw e;
- }
-
+ Activation activation = applicationRepository.activate(session, applicationId, tenant, params.force());
+ waitForActivation(applicationId, timeoutBudget, activation);
restartServicesIfNeeded(applicationId);
storeReindexing(applicationId, session.getMetaData().getGeneration());