From c867646f20962cef8f6fd59d0caf497f2ed7038f Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 9 Jun 2023 09:17:20 -0400 Subject: [PATCH] Drop threshold further Signed-off-by: Stephen Crawford --- .../opensearch/search/backpressure/SearchBackpressureIT.java | 2 +- .../search/backpressure/trackers/CpuUsageTracker.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/internalClusterTest/java/org/opensearch/search/backpressure/SearchBackpressureIT.java b/server/src/internalClusterTest/java/org/opensearch/search/backpressure/SearchBackpressureIT.java index bb448078042bf..26c262c9214b7 100644 --- a/server/src/internalClusterTest/java/org/opensearch/search/backpressure/SearchBackpressureIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/search/backpressure/SearchBackpressureIT.java @@ -151,7 +151,7 @@ public void testSearchShardTaskCancellationWithHighElapsedTime() throws Interrup public void testSearchTaskCancellationWithHighCpu() throws InterruptedException { Settings request = Settings.builder() .put(SearchBackpressureSettings.SETTING_MODE.getKey(), "enforced") - .put(SearchTaskSettings.SETTING_CPU_TIME_MILLIS_THRESHOLD.getKey(), 500) + .put(SearchTaskSettings.SETTING_CPU_TIME_MILLIS_THRESHOLD.getKey(), 50) .build(); assertAcked(client().admin().cluster().prepareUpdateSettings().setPersistentSettings(request).get()); diff --git a/server/src/main/java/org/opensearch/search/backpressure/trackers/CpuUsageTracker.java b/server/src/main/java/org/opensearch/search/backpressure/trackers/CpuUsageTracker.java index a684a0f669429..97a90d58e3685 100644 --- a/server/src/main/java/org/opensearch/search/backpressure/trackers/CpuUsageTracker.java +++ b/server/src/main/java/org/opensearch/search/backpressure/trackers/CpuUsageTracker.java @@ -48,6 +48,7 @@ public Optional checkAndMaybeGetCancellationReason(Task long threshold = thresholdSupplier.getAsLong(); if (usage < threshold) { + return Optional.empty(); }