Increase push frequency and rpc timeout

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);