Merge pull request #11324 from vespa-engine/freva/check-cause

Check against exception cause instead

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();