diff --git a/CHANGELOG.md b/CHANGELOG.md index 0848ed57712d5..eb439799d3fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fallback to netty client if AWS Crt client is not available on the target platform / architecture ([#20698](https://github.com/opensearch-project/OpenSearch/pull/20698)) - Fix ShardSearchFailure in transport-grpc ([#20641](https://github.com/opensearch-project/OpenSearch/pull/20641)) - Fix TLS cert hot-reload for Arrow Flight transport ([#20732](https://github.com/opensearch-project/OpenSearch/pull/20732)) +- Fix misleading heap usage cancellation message in SearchBackpressureService ([#20779](https://github.com/opensearch-project/OpenSearch/pull/20779)) ### Dependencies - Bump shadow-gradle-plugin from 8.3.9 to 9.3.1 ([#20569](https://github.com/opensearch-project/OpenSearch/pull/20569)) diff --git a/server/src/main/java/org/opensearch/search/backpressure/trackers/HeapUsageTracker.java b/server/src/main/java/org/opensearch/search/backpressure/trackers/HeapUsageTracker.java index c69de8ce21f89..fe948242b759f 100644 --- a/server/src/main/java/org/opensearch/search/backpressure/trackers/HeapUsageTracker.java +++ b/server/src/main/java/org/opensearch/search/backpressure/trackers/HeapUsageTracker.java @@ -84,11 +84,7 @@ private void setDefaultResourceUsageBreachEvaluator() { return Optional.of( new TaskCancellation.Reason( - "heap usage exceeded [" - + new ByteSizeValue((long) currentUsage) - + " >= " - + new ByteSizeValue((long) allowedUsage) - + "]", + "heap usage exceeded [" + new ByteSizeValue((long) currentUsage) + " >= " + new ByteSizeValue((long) threshold) + "]", (int) (currentUsage / averageUsage) // TODO: fine-tune the cancellation score/weight ) ); diff --git a/server/src/test/java/org/opensearch/search/backpressure/trackers/HeapUsageTrackerTests.java b/server/src/test/java/org/opensearch/search/backpressure/trackers/HeapUsageTrackerTests.java index 1c46305e9fda6..24c43913962d3 100644 --- a/server/src/test/java/org/opensearch/search/backpressure/trackers/HeapUsageTrackerTests.java +++ b/server/src/test/java/org/opensearch/search/backpressure/trackers/HeapUsageTrackerTests.java @@ -70,7 +70,7 @@ public void testSearchTaskEligibleForCancellation() { Optional reason = tracker.checkAndMaybeGetCancellationReason(task); assertTrue(reason.isPresent()); assertEquals(6, reason.get().getCancellationScore()); - assertEquals("heap usage exceeded [300b >= 150b]", reason.get().getMessage()); + assertEquals("heap usage exceeded [300b >= 0b]", reason.get().getMessage()); } public void testSearchShardTaskEligibleForCancellation() { @@ -100,7 +100,7 @@ public void testSearchShardTaskEligibleForCancellation() { Optional reason = tracker.checkAndMaybeGetCancellationReason(task); assertTrue(reason.isPresent()); assertEquals(4, reason.get().getCancellationScore()); - assertEquals("heap usage exceeded [200b >= 100b]", reason.get().getMessage()); + assertEquals("heap usage exceeded [200b >= 0b]", reason.get().getMessage()); } public void testNotEligibleForCancellation() {