summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-06-27 09:02:41 +0200
committerGitHub <noreply@github.com>2018-06-27 09:02:41 +0200
commit3a0a7788ee38f63b26bd842fceb5175d15476c61 (patch)
treeb918d485c31d0132baaff7471c78a51aa522d6d8 /configserver
parent74a9f8c7bb8a5c19e8b9afa65df49deb87b2c24b (diff)
parentd6674be19df465318f5f929a8779e4a14cae346b (diff)
Merge pull request #6291 from vespa-engine/hmusum/rename-variable
Rename variable
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java10
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;