summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-01-28 10:08:47 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-01-28 10:08:47 +0100
commit12af15e00daf77c63c39feb20d384745be3f9343 (patch)
treeb00b818211203eb63eaec15ed00dc0b13606780f /controller-server
parent1efb1f45499ddd393f5cb288b1e1bc684984c236 (diff)
Retry config convergence fetching after 5 minutes as well
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index b966ddbb389..0db53b7557a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -316,10 +316,7 @@ public class InternalStepRunner implements StepRunner {
Optional.of(platform));
if (services.isEmpty()) {
logger.log("Config status not currently available -- will retry.");
- Step step = setTheStage ? installInitialReal : installReal;
- return run.stepInfo(step).get().startTime().get().isBefore(controller.clock().instant().minus(Duration.ofMinutes(5)))
- ? Optional.of(error)
- : Optional.empty();
+ return Optional.empty();
}
List<Node> nodes = controller.serviceRegistry().configServer().nodeRepository().list(id.type().zone(controller.system()),
id.application(),