Node Stats: Process / Network / Os should only refresh every 5 seconds (refresh_interval to set it), closes elastic#626.

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java

@@ -22,6 +22,8 @@
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.timer.TimerService;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -32,15 +34,27 @@
  */
 public class NetworkService extends AbstractComponent {
 
+    private final TimerService timerService;
+
     private final NetworkProbe probe;
 
     private final NetworkInfo info;
 
-    @Inject public NetworkService(Settings settings, NetworkProbe probe) {
+    private final TimeValue refreshInterval;
+
+    private NetworkStats cachedStats;
+
+    @Inject public NetworkService(Settings settings, NetworkProbe probe, TimerService timerService) {
         super(settings);
         this.probe = probe;
+        this.timerService = timerService;
+
+        this.refreshInterval = componentSettings.getAsTime("refresh_interval", TimeValue.timeValueSeconds(5));
+
+        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
 
         this.info = probe.networkInfo();
+        this.cachedStats = probe.networkStats();
 
         if (logger.isDebugEnabled()) {
             StringBuilder netDebug = new StringBuilder("net_info");
@@ -77,8 +91,11 @@ public NetworkInfo info() {
         return this.info;
     }
 
-    public NetworkStats stats() {
-        return probe.networkStats();
+    public synchronized NetworkStats stats() {
+        if ((timerService.estimatedTimeInMillis() - cachedStats.timestamp()) > refreshInterval.millis()) {
+            cachedStats = probe.networkStats();
+        }
+        return cachedStats;
     }
 
     public String ifconfig() {

modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java

@@ -22,30 +22,45 @@
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.timer.TimerService;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class OsService extends AbstractComponent {
 
+    private final TimerService timerService;
+
     private final OsProbe probe;
 
     private final OsInfo info;
 
-    @Inject public OsService(Settings settings, OsProbe probe) {
+    private final TimeValue refreshInterval;
+
+    private OsStats cachedStats;
+
+    @Inject public OsService(Settings settings, OsProbe probe, TimerService timerService) {
         super(settings);
         this.probe = probe;
+        this.timerService = timerService;
 
         this.info = probe.osInfo();
 
-        logger.trace("Using probe [{}]", probe);
+        this.refreshInterval = componentSettings.getAsTime("refresh_interval", TimeValue.timeValueSeconds(5));
+        this.cachedStats = probe.osStats();
+
+        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
     }
 
     public OsInfo info() {
         return this.info;
     }
 
-    public OsStats stats() {
-        return probe.osStats();
+    public synchronized OsStats stats() {
+        if ((timerService.estimatedTimeInMillis() - cachedStats.timestamp()) > refreshInterval.millis()) {
+            cachedStats = probe.osStats();
+        }
+        return cachedStats;
     }
 }

modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java

@@ -22,29 +22,45 @@
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.timer.TimerService;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class ProcessService extends AbstractComponent {
 
+    private final TimerService timerService;
+
     private final ProcessProbe probe;
 
     private final ProcessInfo info;
 
-    @Inject public ProcessService(Settings settings, ProcessProbe probe) {
+    private final TimeValue refreshInterval;
+
+    private ProcessStats cachedStats;
+
+    @Inject public ProcessService(Settings settings, ProcessProbe probe, TimerService timerService) {
         super(settings);
+        this.timerService = timerService;
         this.probe = probe;
+
+        this.refreshInterval = componentSettings.getAsTime("refresh_interval", TimeValue.timeValueSeconds(5));
+
         this.info = probe.processInfo();
+        this.cachedStats = probe.processStats();
 
-        logger.trace("Using probe [{}]", probe);
+        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
     }
 
     public ProcessInfo info() {
         return this.info;
     }
 
-    public ProcessStats stats() {
-        return probe.processStats();
+    public synchronized ProcessStats stats() {
+        if ((timerService.estimatedTimeInMillis() - cachedStats.timestamp()) > refreshInterval.millis()) {
+            cachedStats = probe.processStats();
+        }
+        return cachedStats;
     }
 }