Skip to content

Add check to avoid underflow in memory manager #4351

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 2 commits into from
Nov 25, 2022
Merged

Add check to avoid underflow in memory manager #4351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8c368
Add check to avoid underflow in memory manager
Nov 23, 2022
45beff2
incorporate PR comment
Nov 24, 2022
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
12 changes: 11 additions & 1 deletion datafusion/core/src/execution/memory_manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ impl MemoryManager {

fn max_mem_for_requesters(&self) -> usize {
let trk_total = self.get_tracker_total();
self.pool_size - trk_total
self.pool_size.saturating_sub(trk_total)
}

/// Grow memory attempt from a consumer, return if we could grant that much to it
Expand Down Expand Up @@ -651,4 +651,14 @@ mod tests {
let config = MemoryManagerConfig::try_new_limit(100000, 0.1).unwrap();
assert_eq!(config.pool_size(), 10000);
}

#[tokio::test]
async fn test_memory_manager_underflow() {
let config = MemoryManagerConfig::try_new_limit(100, 0.5).unwrap();
let manager = MemoryManager::new(config);
manager.grow_tracker_usage(100);

manager.register_requester(&MemoryConsumerId::new(1));
assert!(!manager.can_grow_directly(20, 0));
}
}