Skip to content

fix: Do not panic on underflow when shrinking memory usage tracker #181

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

Merged
merged 1 commit into from
May 27, 2025
Merged

fix: Do not panic on underflow when shrinking memory usage tracker #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 6 additions & 15 deletions datafusion/core/src/execution/memory_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,21 +288,12 @@ impl MemoryManager {
}

pub(crate) fn shrink_tracker_usage(&self, delta: usize) {
let update =
self.trackers_total
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |x| {
if x >= delta {
Some(x - delta)
} else {
None
}
});
update.unwrap_or_else(|_| {
panic!(
"Tracker total memory shrink by {} underflow, current value is ",
delta
)
});
self.trackers_total
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |x| {
// Do not panic, set to usize::MIN on underflow
Some(x.saturating_sub(delta))
})
.expect("Unexpected underflow in tracker memory usage");
}

fn get_requester_total(&self) -> usize {
Expand Down