Skip to content

fix read deadlock #165

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
luoyuxia merged 1 commit into from
Jan 16, 2026
Merged

fix read deadlock #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions crates/fluss/src/client/table/log_fetch_buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,19 +211,27 @@ impl LogFetchBuffer {
pub fn buffered_buckets(&self) -> Vec<TableBucket> {
let mut buckets = Vec::new();

let next_in_line_fetch = self.next_in_line_fetch.lock();
if let Some(complete_fetch) = next_in_line_fetch.as_ref() {
if !complete_fetch.is_consumed() {
buckets.push(complete_fetch.table_bucket().clone());
// Avoid holding multiple locks at once to prevent lock-order inversion.
{
let next_in_line_fetch = self.next_in_line_fetch.lock();
if let Some(complete_fetch) = next_in_line_fetch.as_ref() {
if !complete_fetch.is_consumed() {
buckets.push(complete_fetch.table_bucket().clone());
}
}
}

let completed = self.completed_fetches.lock();
for fetch in completed.iter() {
buckets.push(fetch.table_bucket().clone());
{
let completed = self.completed_fetches.lock();
for fetch in completed.iter() {
buckets.push(fetch.table_bucket().clone());
}
}

{
let pending = self.pending_fetches.lock();
buckets.extend(pending.keys().cloned());
}
let pending = self.pending_fetches.lock();
buckets.extend(pending.keys().cloned());
buckets
}
}
Expand Down
Loading