honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael McCandless 2015-06-12 10:09:55 -04:00
parent 4e94d097e7 f152614f92
commit 8e85304af3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java
View File

@ -564,7 +564,7 @@ public class ThreadPool extends AbstractComponent {
EstimatedTimeThread(String name, long interval) { EstimatedTimeThread(String name, long interval) {
super(name); super(name);
this.interval = interval; this.interval = interval;
this.estimatedTimeInMillis = System.currentTimeMillis(); this.estimatedTimeInMillis = TimeValue.nsecToMSec(System.nanoTime());
this.counter = new TimeCounter(); this.counter = new TimeCounter();
setDaemon(true); setDaemon(true);
} }
@ -576,7 +576,7 @@ public class ThreadPool extends AbstractComponent {
@Override @Override
public void run() { public void run() {
while (running) { while (running) {
estimatedTimeInMillis = System.currentTimeMillis(); estimatedTimeInMillis = TimeValue.nsecToMSec(System.nanoTime());
try { try {
Thread.sleep(interval); Thread.sleep(interval);
} catch (InterruptedException e) { } catch (InterruptedException e) {