diff options
author | gjoranv <gjoranv@gmail.com> | 2017-06-22 17:33:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-22 17:33:44 +0200 |
commit | be92d0d7bb839647d66a9c7e22a4f821d77606db (patch) | |
tree | e8cc523193892f44eae17e448a9b6b433f766bce /node-admin | |
parent | bd24fd92be50fd17cb67183a4500f0b11746d5c9 (diff) | |
parent | 8d818137d848bba002f9729e4210b89718389606 (diff) |
Merge pull request #2868 from yahoo/freva/increase-frequency-metrics-push
Increase push frequency and rpc timeout
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java | 2 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 2 |
2 files changed, 2 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 84679d1dadd..28a6fb91c19 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 @@ -87,7 +87,7 @@ public class NodeAdminImpl implements NodeAdmin { } catch (Throwable e) { logger.warning("Metric fetcher scheduler failed", e); } - }, 0, 55, TimeUnit.SECONDS); + }, 0, 40, TimeUnit.SECONDS); aclMaintainer.ifPresent(maintainer -> aclScheduler.scheduleWithFixedDelay(() -> { if (!isFrozen()) maintainer.run(); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 6145e2e372e..c217128675b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -577,7 +577,7 @@ public class NodeAgentImpl implements NodeAgent { String wrappedMetrics = "s:" + params.toString(); // Push metrics to the metrics proxy in each container - give it maximum 1 seconds to complete - String[] command = {"rpc_invoke", "-t", "1", "tcp/localhost:19091", "setExtraMetrics", wrappedMetrics}; + String[] command = {"rpc_invoke", "-t", "2", "tcp/localhost:19091", "setExtraMetrics", wrappedMetrics}; dockerOperations.executeCommandInContainerAsRoot(containerName, 5L, command); } catch (DockerExecTimeoutException | JsonProcessingException e) { logger.warning("Unable to push metrics to container: " + containerName, e); |