Merge pull request #11626 from mikemccand/thread_pool_nano_time

Use System.nanoTime for ThreadPool's estimated time, since it's less likely to go backwards
elastic · Jun 12, 2015 · 8e85304 · 8e85304
2 parents 4e94d09 + f152614
commit 8e85304
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java
@@ -564,7 +564,7 @@ static class EstimatedTimeThread extends Thread {
         EstimatedTimeThread(String name, long interval) {
             super(name);
             this.interval = interval;
-            this.estimatedTimeInMillis = System.currentTimeMillis();
+            this.estimatedTimeInMillis = TimeValue.nsecToMSec(System.nanoTime());
             this.counter = new TimeCounter();
             setDaemon(true);
         }
@@ -576,7 +576,7 @@ public long estimatedTimeInMillis() {
         @Override
         public void run() {
             while (running) {
-                estimatedTimeInMillis = System.currentTimeMillis();
+                estimatedTimeInMillis = TimeValue.nsecToMSec(System.nanoTime());
                 try {
                     Thread.sleep(interval);
                 } catch (InterruptedException e) {