This is an automated email from the ASF dual-hosted git repository.
dheres pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new d010ce90f4 refactor(11523): update OOM message provided for a single
failed reservation (#11771)
d010ce90f4 is described below
commit d010ce90f40f2866904a4eea563afbbff72497cc
Author: wiedld <[email protected]>
AuthorDate: Thu Aug 1 23:12:23 2024 -0700
refactor(11523): update OOM message provided for a single failed
reservation (#11771)
---
datafusion/execution/src/memory_pool/pool.rs | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/datafusion/execution/src/memory_pool/pool.rs
b/datafusion/execution/src/memory_pool/pool.rs
index 9cb6f207e5..4a41602bd9 100644
--- a/datafusion/execution/src/memory_pool/pool.rs
+++ b/datafusion/execution/src/memory_pool/pool.rs
@@ -246,7 +246,7 @@ fn insufficient_capacity_err(
additional: usize,
available: usize,
) -> DataFusionError {
- resources_datafusion_err!("Failed to allocate additional {} bytes for {}
with {} bytes already allocated - maximum available is {}", additional,
reservation.registration.consumer.name, reservation.size, available)
+ resources_datafusion_err!("Failed to allocate additional {} bytes for {}
with {} bytes already allocated for this reservation - {} bytes remain
available for the total pool", additional,
reservation.registration.consumer.name, reservation.size, available)
}
/// A [`MemoryPool`] that tracks the consumers that have
@@ -418,10 +418,10 @@ mod tests {
assert_eq!(pool.reserved(), 4000);
let err = r2.try_grow(1).unwrap_err().strip_backtrace();
- assert_eq!(err, "Resources exhausted: Failed to allocate additional 1
bytes for r2 with 2000 bytes already allocated - maximum available is 0");
+ assert_eq!(err, "Resources exhausted: Failed to allocate additional 1
bytes for r2 with 2000 bytes already allocated for this reservation - 0 bytes
remain available for the total pool");
let err = r2.try_grow(1).unwrap_err().strip_backtrace();
- assert_eq!(err, "Resources exhausted: Failed to allocate additional 1
bytes for r2 with 2000 bytes already allocated - maximum available is 0");
+ assert_eq!(err, "Resources exhausted: Failed to allocate additional 1
bytes for r2 with 2000 bytes already allocated for this reservation - 0 bytes
remain available for the total pool");
r1.shrink(1990);
r2.shrink(2000);
@@ -446,12 +446,12 @@ mod tests {
.register(&pool);
let err = r3.try_grow(70).unwrap_err().strip_backtrace();
- assert_eq!(err, "Resources exhausted: Failed to allocate additional 70
bytes for r3 with 0 bytes already allocated - maximum available is 40");
+ assert_eq!(err, "Resources exhausted: Failed to allocate additional 70
bytes for r3 with 0 bytes already allocated for this reservation - 40 bytes
remain available for the total pool");
//Shrinking r2 to zero doesn't allow a3 to allocate more than 45
r2.free();
let err = r3.try_grow(70).unwrap_err().strip_backtrace();
- assert_eq!(err, "Resources exhausted: Failed to allocate additional 70
bytes for r3 with 0 bytes already allocated - maximum available is 40");
+ assert_eq!(err, "Resources exhausted: Failed to allocate additional 70
bytes for r3 with 0 bytes already allocated for this reservation - 40 bytes
remain available for the total pool");
// But dropping r2 does
drop(r2);
@@ -464,7 +464,7 @@ mod tests {
let mut r4 = MemoryConsumer::new("s4").register(&pool);
let err = r4.try_grow(30).unwrap_err().strip_backtrace();
- assert_eq!(err, "Resources exhausted: Failed to allocate additional 30
bytes for s4 with 0 bytes already allocated - maximum available is 20");
+ assert_eq!(err, "Resources exhausted: Failed to allocate additional 30
bytes for s4 with 0 bytes already allocated for this reservation - 20 bytes
remain available for the total pool");
}
#[test]
@@ -501,7 +501,7 @@ mod tests {
// Test: reports if new reservation causes error
// using the previously set sizes for other consumers
let mut r5 = MemoryConsumer::new("r5").register(&pool);
- let expected = "Resources exhausted with top memory consumers (across
reservations) are: r1 consumed 50 bytes, r3 consumed 20 bytes, r2 consumed 15
bytes. Error: Failed to allocate additional 150 bytes for r5 with 0 bytes
already allocated - maximum available is 5";
+ let expected = "Resources exhausted with top memory consumers (across
reservations) are: r1 consumed 50 bytes, r3 consumed 20 bytes, r2 consumed 15
bytes. Error: Failed to allocate additional 150 bytes for r5 with 0 bytes
already allocated for this reservation - 5 bytes remain available for the total
pool";
let res = r5.try_grow(150);
assert!(
matches!(
@@ -524,7 +524,7 @@ mod tests {
// Test: see error message when no consumers recorded yet
let mut r0 = MemoryConsumer::new(same_name).register(&pool);
- let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 0 bytes. Error: Failed to allocate additional
150 bytes for foo with 0 bytes already allocated - maximum available is 100";
+ let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 0 bytes. Error: Failed to allocate additional
150 bytes for foo with 0 bytes already allocated for this reservation - 100
bytes remain available for the total pool";
let res = r0.try_grow(150);
assert!(
matches!(
@@ -543,7 +543,7 @@ mod tests {
let mut r1 = new_consumer_same_name.clone().register(&pool);
// TODO: the insufficient_capacity_err() message is per reservation,
not per consumer.
// a followup PR will clarify this message "0 bytes already allocated
for this reservation"
- let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 10 bytes. Error: Failed to allocate additional
150 bytes for foo with 0 bytes already allocated - maximum available is 90";
+ let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 10 bytes. Error: Failed to allocate additional
150 bytes for foo with 0 bytes already allocated for this reservation - 90
bytes remain available for the total pool";
let res = r1.try_grow(150);
assert!(
matches!(
@@ -555,7 +555,7 @@ mod tests {
// Test: will accumulate size changes per consumer, not per reservation
r1.grow(20);
- let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 30 bytes. Error: Failed to allocate additional
150 bytes for foo with 20 bytes already allocated - maximum available is 70";
+ let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo consumed 30 bytes. Error: Failed to allocate additional
150 bytes for foo with 20 bytes already allocated for this reservation - 70
bytes remain available for the total pool";
let res = r1.try_grow(150);
assert!(
matches!(
@@ -570,7 +570,7 @@ mod tests {
let consumer_with_same_name_but_different_hash =
MemoryConsumer::new(same_name).with_can_spill(true);
let mut r2 =
consumer_with_same_name_but_different_hash.register(&pool);
- let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo(can_spill=false) consumed 30 bytes, foo(can_spill=true)
consumed 0 bytes. Error: Failed to allocate additional 150 bytes for foo with 0
bytes already allocated - maximum available is 70";
+ let expected = "Resources exhausted with top memory consumers (across
reservations) are: foo(can_spill=false) consumed 30 bytes, foo(can_spill=true)
consumed 0 bytes. Error: Failed to allocate additional 150 bytes for foo with 0
bytes already allocated for this reservation - 70 bytes remain available for
the total pool";
let res = r2.try_grow(150);
assert!(
matches!(
@@ -590,7 +590,7 @@ mod tests {
let r1_consumer = MemoryConsumer::new("r1");
let mut r1 = r1_consumer.clone().register(&pool);
r1.grow(20);
- let expected = "Resources exhausted with top memory consumers
(across reservations) are: r1 consumed 20 bytes, r0 consumed 10 bytes. Error:
Failed to allocate additional 150 bytes for r0 with 10 bytes already allocated
- maximum available is 70";
+ let expected = "Resources exhausted with top memory consumers
(across reservations) are: r1 consumed 20 bytes, r0 consumed 10 bytes. Error:
Failed to allocate additional 150 bytes for r0 with 10 bytes already allocated
for this reservation - 70 bytes remain available for the total pool";
let res = r0.try_grow(150);
assert!(
matches!(
@@ -616,7 +616,7 @@ mod tests {
// Test: actual message we see is the `available is 70`. When it
should be `available is 90`.
// This is because the pool.shrink() does not automatically occur
within the inner_pool.deregister().
- let expected_70_available = "Failed to allocate additional 150
bytes for r0 with 10 bytes already allocated - maximum available is 70";
+ let expected_70_available = "Failed to allocate additional 150
bytes for r0 with 10 bytes already allocated for this reservation - 70 bytes
remain available for the total pool";
let res = r0.try_grow(150);
assert!(
matches!(
@@ -629,7 +629,7 @@ mod tests {
// Test: the registration needs to free itself (or be dropped),
// for the proper error message
r1.free();
- let expected_90_available = "Failed to allocate additional 150
bytes for r0 with 10 bytes already allocated - maximum available is 90";
+ let expected_90_available = "Failed to allocate additional 150
bytes for r0 with 10 bytes already allocated for this reservation - 90 bytes
remain available for the total pool";
let res = r0.try_grow(150);
assert!(
matches!(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
