summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-11-18 09:52:26 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-11-18 09:52:26 +0100
commitea75fde1aa76dd07146e05cc5985cbbc91a1788c (patch)
treeaaab47c001508710884784ef010e39bb495512ba /configserver
parentb24dd074584ad83a547a81b95e19d49261d7b849 (diff)
Check against exception cause instead
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index d490b1b49e9..91aa57bb88a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -246,12 +246,14 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
ApplicationId app = f.getKey();
try {
f.getValue().get();
- } catch (TransientException e) {
- log.log(LogLevel.INFO, "Redeploying " + app +
- " failed with transient error, will retry after bootstrap: " + Exceptions.toMessageString(e));
} catch (ExecutionException e) {
- log.log(LogLevel.WARNING, "Redeploying " + app + " failed, will retry", e);
- failedDeployments.add(app);
+ if (e.getCause() instanceof TransientException) {
+ log.log(LogLevel.INFO, "Redeploying " + app +
+ " failed with transient error, will retry after bootstrap: " + Exceptions.toMessageString(e));
+ } else {
+ log.log(LogLevel.WARNING, "Redeploying " + app + " failed, will retry", e);
+ failedDeployments.add(app);
+ }
}
}
executor.shutdown();