Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions datafusion/core/tests/memory_limit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -602,10 +602,10 @@ async fn test_disk_spill_limit_reached() -> Result<()> {
.await
.unwrap();

let err = df.collect().await.unwrap_err();
assert_contains!(
err.to_string(),
"The used disk space during the spilling process has exceeded the allowable limit"
let error_message = df.collect().await.unwrap_err().to_string();
assert!(
error_message.contains("The used disk space during the spilling process has exceeded the allowable limit") &&
error_message.contains("datafusion.runtime.max_temp_directory_size"),
);

Ok(())
Expand Down
3 changes: 2 additions & 1 deletion datafusion/execution/src/disk_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,8 @@ impl RefCountedTempFile {
let global_disk_usage = self.disk_manager.used_disk_space.load(Ordering::Relaxed);
if global_disk_usage > self.disk_manager.max_temp_directory_size {
return resources_err!(
"The used disk space during the spilling process has exceeded the allowable limit of {}. Try increasing the `max_temp_directory_size` in the disk manager configuration.",
"The used disk space during the spilling process has exceeded the allowable limit of {}. \
Please try increasing the config: `datafusion.runtime.max_temp_directory_size`.",
human_readable_size(self.disk_manager.max_temp_directory_size as usize)
);
}
Expand Down