Disable time cache on interval == 0

matriv · matriv · commit 7fed99ae0f5f · 2019-02-18T10:44:31.000+02:00
diff --git a/server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java
@@ -550,22 +550,39 @@ static class CachedTimeThread extends Thread {
             this.absoluteMillis = System.currentTimeMillis();
             this.counter = new TimeCounter();
             setDaemon(true);
+            if (interval <= 0) {
+                this.running = false;
+            }
         }
 
         /**
          * Return the current time used for relative calculations. This is
          * {@link System#nanoTime()} truncated to milliseconds.
+         * <p>
+         * If {@link ThreadPool#ESTIMATED_TIME_INTERVAL_SETTING} is set to 0
+         * then the cache is disabled and the method calls {@link System#nanoTime()}
+         * whenever called. Typically used for testing.
          */
         long relativeTimeInMillis() {
-            return relativeMillis;
+            if (running) {
+                return relativeMillis;
+            }
+            return TimeValue.nsecToMSec(System.nanoTime());
         }
 
         /**
          * Return the current epoch time, used to find absolute time. This is
          * a cached version of {@link System#currentTimeMillis()}.
+         * <p>
+         * If {@link ThreadPool#ESTIMATED_TIME_INTERVAL_SETTING} is set to 0
+         * then the cache is disabled and the method calls {@link System#currentTimeMillis()}
+         * whenever called. Typically used for testing.
          */
         long absoluteTimeInMillis() {
-            return absoluteMillis;
+            if (running) {
+                return absoluteMillis;
+            }
+            return System.currentTimeMillis();
         }
 
         @Override
diff --git a/server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
@@ -134,7 +134,7 @@ public List<Setting<?>> getSettings() {
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.builder().put(super.nodeSettings(nodeOrdinal))
-            .put("thread_pool.estimated_time_interval", TimeValue.timeValueMillis(1))
+            .put("thread_pool.estimated_time_interval", 0)
             .build();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public List<Setting<?>> getSettings() {`
`134`	`134`	`@Override`
`135`	`135`	`protected Settings nodeSettings(int nodeOrdinal) {`
`136`	`136`	`return Settings.builder().put(super.nodeSettings(nodeOrdinal))`
`137`		`- .put("thread_pool.estimated_time_interval", TimeValue.timeValueMillis(1))`
	`137`	`+ .put("thread_pool.estimated_time_interval", 0)`
`138`	`138`	`.build();`
`139`	`139`	`}`
`140`	`140`