summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2017-12-20 13:45:30 +0100
committerHåkon Hallingstad <hakon@oath.com>2017-12-20 13:45:30 +0100
commitcedd27bb9f85ee2ecc93c20283df5d85316ba5a4 (patch)
tree7d1c878bda072ed315aa621358bfb3a6399db1a0 /node-admin
parent2be1c34825fda8bdf9711c1e7522989fe3a8a45e (diff)
Increase node admin delays
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java3
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 2d22f4c4ccf..868ebf39f70 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -179,9 +179,10 @@ public class NodeAdminImpl implements NodeAdmin {
}
}, 0, 55, TimeUnit.SECONDS);
+ int delay = 120; // WARNING: Reducing this will increase the load on config servers.
aclScheduler.scheduleWithFixedDelay(() -> {
if (!isFrozen()) aclMaintainer.run();
- }, 30, 60, TimeUnit.SECONDS);
+ }, 30, delay, TimeUnit.SECONDS);
}
@Override
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
index a343e431b5a..3777d7e20d1 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
@@ -36,7 +36,8 @@ import java.util.function.Function;
*/
public class NodeAdminProvider implements Provider<NodeAdminStateUpdater> {
- private static final Duration NODE_AGENT_SCAN_INTERVAL = Duration.ofSeconds(30);
+ // WARNING: reducing the node agent interval will increase the load on the config servers
+ private static final Duration NODE_AGENT_SCAN_INTERVAL = Duration.ofSeconds(60);
private static final Duration NODE_ADMIN_CONVERGE_STATE_INTERVAL = Duration.ofSeconds(30);
private final NodeAdminStateUpdater nodeAdminStateUpdater;