diff options
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 109afe87e89..5fcf835ddab 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -564,14 +564,14 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye boolean redeployAllApplications(Duration maxDuration) throws InterruptedException { Instant end = Instant.now().plus(maxDuration); - Set<ApplicationId> applicationIds = listApplications(); + Set<ApplicationId> applicationsNotRedeployed = listApplications(); do { - applicationIds = redeployApplications(applicationIds); - } while ( ! applicationIds.isEmpty() && Instant.now().isBefore(end)); + applicationsNotRedeployed = redeployApplications(applicationsNotRedeployed); + } while ( ! applicationsNotRedeployed.isEmpty() && Instant.now().isBefore(end)); - if ( ! applicationIds.isEmpty()) { + if ( ! applicationsNotRedeployed.isEmpty()) { log.log(LogLevel.ERROR, "Redeploying applications not finished after " + maxDuration + - ", exiting, applications that failed redeployment: " + applicationIds); + ", exiting, applications that failed redeployment: " + applicationsNotRedeployed); return false; } return true; |