diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-19 07:44:52 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-03-19 07:44:52 +0100 |
commit | 2a64c8abdc1bedeb8949fc73c1fae518d045cb69 (patch) | |
tree | 55ed9a855db9633138b2a30552114cb0e9b6a61b /configserver | |
parent | e70edcd11817084a42c14af33af7007787fe1cd5 (diff) |
Rename variable
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java | 16 |
1 files changed, 8 insertions, 8 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 be26e880440..24926f51b15 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 @@ -204,23 +204,23 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable private boolean redeployAllApplications() throws InterruptedException { Instant end = Instant.now().plus(maxDurationOfRedeployment); - List<ApplicationId> applicationsNotRedeployed = applicationRepository.listApplications(); - Collections.shuffle(applicationsNotRedeployed); + List<ApplicationId> applicationsToRedeploy = applicationRepository.listApplications(); + Collections.shuffle(applicationsToRedeploy); long failCount = 0; do { - applicationsNotRedeployed = redeployApplications(applicationsNotRedeployed); - if ( ! applicationsNotRedeployed.isEmpty() && ! sleepTimeWhenRedeployingFails.isZero()) { + applicationsToRedeploy = redeployApplications(applicationsToRedeploy); + if ( ! applicationsToRedeploy.isEmpty() && ! sleepTimeWhenRedeployingFails.isZero()) { Duration sleepTime = sleepTimeWhenRedeployingFails.multipliedBy(++failCount); if (sleepTime.compareTo(Duration.ofMinutes(10)) > 0) sleepTime = Duration.ofMinutes(10); - log.log(Level.INFO, "Redeployment of " + applicationsNotRedeployed + " not finished, will retry in " + sleepTime); + log.log(Level.INFO, "Redeployment of " + applicationsToRedeploy + " not finished, will retry in " + sleepTime); Thread.sleep(sleepTime.toMillis()); } - } while ( ! applicationsNotRedeployed.isEmpty() && Instant.now().isBefore(end)); + } while ( ! applicationsToRedeploy.isEmpty() && Instant.now().isBefore(end)); - if ( ! applicationsNotRedeployed.isEmpty()) { + if ( ! applicationsToRedeploy.isEmpty()) { log.log(Level.SEVERE, "Redeploying applications not finished after " + maxDurationOfRedeployment + - ", exiting, applications that failed redeployment: " + applicationsNotRedeployed); + ", exiting, applications that failed redeployment: " + applicationsToRedeploy); return false; } return true; |