Skip to content

fix: race condition in SpillPool caused by buffered stream #20067

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

Open
dekuu5 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: race condition in SpillPool caused by buffered stream #20067

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccde430
fix: race condition in SpillPool caused by buffered stream
dekuu5 Jan 29, 2026
1b8ef43
Merge branch 'main' into test_SpillPool
dekuu5 Jan 29, 2026
102c121
Merge branch 'apache:main' into test_SpillPool
dekuu5 Jan 31, 2026
186b699
added tests
dekuu5 Jan 31, 2026
6139690
removed batch_read_buffer_capacity no longer needed
dekuu5 Jan 31, 2026
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
4 changes: 2 additions & 2 deletions datafusion/physical-plan/src/spill/spill_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use std::sync::Arc;

use super::{SpillReaderStream, in_progress_spill_file::InProgressSpillFile};
use crate::coop::cooperative;
use crate::{common::spawn_buffered, metrics::SpillMetrics};
use crate::metrics::SpillMetrics;

/// The `SpillManager` is responsible for the following tasks:
/// - Reading and writing `RecordBatch`es to raw files based on the provided configurations.
Expand Down Expand Up @@ -186,7 +186,7 @@ impl SpillManager {
max_record_batch_memory,
)));

Ok(spawn_buffered(stream, self.batch_read_buffer_capacity))
Copy link
Member

@martin-g martin-g Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems batch_read_buffer_capacity is no more used.
It could be deprecated or maybe even removed.
https://github.com/dekuu5/datafusion/blob/1b8ef43fdd1424a3e4fe2db213fec4e7228788b0/datafusion/physical-plan/src/sorts/multi_level_merge.rs#L276 is a no-op

Copy link
Author

@dekuu5 dekuu5 Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay sure i will look into that and the tests also

Ok(stream)
}
}

Expand Down