summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 3cc3e749904..1aa70ff4b5b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -206,7 +206,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
} else {
deployLogger.log(Level.INFO, "Services did not converge on new config generation " +
response.wantedGeneration + ", current generation: " + response.currentGeneration + ", will retry");
- try { Thread.sleep(10_000); } catch (InterruptedException e) { /* ignore */ }
+ try { Thread.sleep(5_000); } catch (InterruptedException e) { /* ignore */ }
}
}
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
index b489eb70927..ad68073053d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
@@ -100,7 +100,7 @@ public class ApplicationApiHandler extends SessionHandler {
@Override
public Duration getTimeout() {
- return zookeeperBarrierTimeout.plus(Duration.ofSeconds(10));
+ return zookeeperBarrierTimeout.plus(Duration.ofSeconds(30));
}
private TenantName validateTenant(HttpRequest request) {