fix: incorrect memory usage track for sort #2135
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yjshen
commented
Apr 4, 2022
| result | ||
| } else { | ||
| Ok(Box::pin(EmptyRecordBatchStream::new(self.schema.clone()))) | ||
| } | ||
| } | ||
|
|
||
| fn free_all_memory(&self) -> usize { | ||
| let used = self.metrics.mem_used().set(0); | ||
| self.shrink(used); |
There was a problem hiding this comment.
The first fix, return all memory to the manager.
| @@ -342,8 +349,8 @@ impl MemoryManager { | |||
| // if we cannot acquire at lease 1/2n memory, just wait for others | |||
| // to spill instead spill self frequently with limited total mem | |||
| debug!( | |||
| "Cannot acquire minimum amount of memory {} on memory manager {}, waiting for others to spill ...", | |||
| human_readable_size(min_per_rqt), self); | |||
| "Cannot acquire a minimum amount of {} memory from the manager of total {}, waiting for others to spill ...", | |||
There was a problem hiding this comment.
The second fix: stop calling std::fmt::Display on memory manager since it's acquiring a lock we are already holding.
| @@ -378,6 +403,8 @@ impl MemoryManager { | |||
| let mut total = self.requesters_total.lock(); | |||
| assert!(*total >= mem_used); | |||
| *total -= mem_used; | |||
| self.cv.notify_all(); | |||
| return; | |||
There was a problem hiding this comment.
The third fix: stop releasing memory twice for requesters.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #2155.
Rationale for this change
MemTrackingMetricsto ease memory tracking for non-limited memory consumers #1691:The sort memory is not correctly tracked anymore.
What changes are included in this PR?
Are there any user-facing changes?
No.