From 9fa301e5664aa35b3f014c97f30cb757a384fd46 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 9 Jan 2019 09:07:47 +0100 Subject: Since there is no dependency between the monitorer and the monitored, let us give it some more time to avoid noise in the log and system tests. --- .../main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java | 4 ++-- .../com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java index 5813c3eb04a..87e9fa287a4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java @@ -48,8 +48,8 @@ public class Metrics extends TimerTask implements MetricUpdaterFactory { log.log(LogLevel.DEBUG, "Metric update interval is " + healthMonitorConfig.snapshot_interval() + " seconds"); long intervalMs = (long) (healthMonitorConfig.snapshot_interval() * 1000); - timer.scheduleAtFixedRate(this, 5000, intervalMs); - zkMetricUpdater = new ZKMetricUpdater(zkServerConfig, 4500, intervalMs); + timer.scheduleAtFixedRate(this, 20000, intervalMs); + zkMetricUpdater = new ZKMetricUpdater(zkServerConfig, 19500, intervalMs); } public static Metrics createTestMetrics() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java index d61f8a7b9fe..408bf44e733 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java @@ -43,10 +43,10 @@ public class ZKMetricUpdater extends TimerTask { private final Timer timer = new Timer(); private final int zkPort; - public ZKMetricUpdater(ZookeeperServerConfig zkServerConfig, long delay, long interval) { + public ZKMetricUpdater(ZookeeperServerConfig zkServerConfig, long delayMS, long intervalMS) { this.zkPort = zkServerConfig.clientPort(); - if (interval > 0) { - timer.scheduleAtFixedRate(this, delay, interval); + if (intervalMS > 0) { + timer.scheduleAtFixedRate(this, delayMS, intervalMS); } } -- cgit v1.2.3