From 82a369737b59b9230813841ceb7d611c22e21755 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Tue, 23 May 2017 10:37:17 -0600 Subject: [PATCH] [TEST] Add additional assert logging --- .../concurrent/QueueResizingEsThreadPoolExecutor.java | 10 +++++----- .../QueueResizingEsThreadPoolExecutorTests.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java index 854dc862315..898c2203d0b 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java @@ -91,19 +91,19 @@ public final class QueueResizingEsThreadPoolExecutor extends EsThreadPoolExecuto * Calculate task rate (λ), for a fixed number of tasks and time it took those tasks to be measured * * @param totalNumberOfTasks total number of tasks that were measured - * @param totalFrameFrameNanos nanoseconds during which the tasks were received + * @param totalFrameTaskNanos nanoseconds during which the tasks were received * @return the rate of tasks in the system */ - static double calculateLambda(final int totalNumberOfTasks, final long totalFrameFrameNanos) { - assert totalFrameFrameNanos > 0 : "cannot calculate for instantaneous tasks"; - assert totalNumberOfTasks > 0 : "cannot calculate for no tasks"; + static double calculateLambda(final int totalNumberOfTasks, final long totalFrameTaskNanos) { + assert totalFrameTaskNanos > 0 : "cannot calculate for instantaneous tasks, got: " + totalFrameTaskNanos; + assert totalNumberOfTasks > 0 : "cannot calculate for no tasks, got: " + totalNumberOfTasks; // There is no set execution time, instead we adjust the time window based on the // number of completed tasks, so there is no background thread required to update the // queue size at a regular interval. This means we need to calculate our λ by the // total runtime, rather than a fixed interval. // λ = total tasks divided by measurement time - return (double) totalNumberOfTasks / totalFrameFrameNanos; + return (double) totalNumberOfTasks / totalFrameTaskNanos; } /** diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java index 732ec94ae10..82b67806b79 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java @@ -192,7 +192,7 @@ public class QueueResizingEsThreadPoolExecutorTests extends ESTestCase { private Function fastWrapper() { return (runnable) -> { - return new SettableTimedRunnable(TimeUnit.NANOSECONDS.toNanos(50)); + return new SettableTimedRunnable(TimeUnit.NANOSECONDS.toNanos(100)); }; }