Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug in Search Backpressure #6455

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Fix a bug in Search Backpressure #6455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e76ecd
Fix a bug in Search Backpressure
PritLadani Feb 23, 2023
bce2756
Adding changelog entry
PritLadani Feb 23, 2023
b33c490
Revert "Adding changelog entry"
PritLadani Feb 23, 2023
9256ef7
Empty commit
PritLadani Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased 2.x]
### Added
- Add GeoTile and GeoHash Grid aggregations on GeoShapes. ([#5589](https://github.com/opensearch-project/OpenSearch/pull/5589))
- Small bug fix in Search Backpressure's HeapUsageTracker ([#6455](https://github.com/opensearch-project/OpenSearch/pull/6455))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For small non-customer facing changes , we can skip the changelog.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, removing it.


### Dependencies

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/search/backpressure/trackers/HeapUsageTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static boolean isHeapTrackingSupported() {
*/
public static boolean isHeapUsageDominatedBySearch(List<CancellableTask> cancellableTasks, double heapPercentThreshold) {
long usage = cancellableTasks.stream().mapToLong(task -> task.getTotalResourceStats().getMemoryInBytes()).sum();
long threshold = (long) heapPercentThreshold * HEAP_SIZE_BYTES;
long threshold = (long) (heapPercentThreshold * HEAP_SIZE_BYTES);
Copy link
Member

@dreamer-89 dreamer-89 Feb 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Good to have one unit test which verifies this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PritLadani Can you add unit tests here in a follow up PR? This is a public static method and should be pretty straightforward to unit test.

Done here. #6463
Thanks!

if (isHeapTrackingSupported() && usage < threshold) {
logger.debug("heap usage not dominated by search requests [{}/{}]", usage, threshold);
return false;
Expand Down