Skip to content

Commit 5057324

Browse files
some improvements from Nick's review.
1 parent f9488fe commit 5057324

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

server/src/main/java/org/elasticsearch/common/util/concurrent/TaskExecutionTimeTrackingEsThreadPoolExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ public boolean trackingMaxQueueLatency() {
264264
* Uses the difference of {@link #totalExecutionTime} since the last polling request to determine how much activity has occurred.
265265
*/
266266
private class UtilizationTracker {
267-
volatile long lastPollTime = System.nanoTime();
268-
volatile long lastTotalExecutionTime = 0;
267+
long lastPollTime = System.nanoTime();
268+
long lastTotalExecutionTime = 0;
269269

270-
public double pollUtilization() {
270+
public synchronized double pollUtilization() {
271271
final long currentTotalExecutionTimeNanos = totalExecutionTime.sum();
272272
final long currentPollTimeNanos = System.nanoTime();
273273

server/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,9 @@ <T> T assertLatestMetricValueMatches(
682682
List<Measurement> measurements = meterRegistry.getRecorder()
683683
.getMeasurements(instrumentType, ThreadPool.THREAD_POOL_METRIC_PREFIX + threadPoolName + name);
684684
assertFalse(name + " has no measurements", measurements.isEmpty());
685-
assertThat(valueExtractor.apply(measurements.getLast()), matcher);
686-
return valueExtractor.apply(measurements.getLast());
685+
var latestMetric = valueExtractor.apply(measurements.getLast());
686+
assertThat(latestMetric, matcher);
687+
return latestMetric;
687688
}
688689
}
689690

0 commit comments

Comments
 (0)