Skip to content
Merged
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ log = "0.4"
memmap2 = "0.9.4"
rand = "0.9"
rand_distr = "0.5"
fs4 = "0.12.0"
fs4 = "0.13.1"
# fs4 depends on rustix, but pulling this dependency explicitly into the tree
# to use direct functions on FreeBSD
rustix = { version = "0", features = [ "fs" ]}
rustix = { version = "1", features = [ "fs" ]}
crossbeam-channel = "0.5"

# Binary dependencies
Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ impl Wal {
dir
};

dir.try_lock_exclusive()?;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for next time I'd be good if you could explain the non trivial changes in the PR description

I checked the changelog myself https://github.com/al8n/fs4-rs/blob/main/CHANGELOG.md#0130

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Will make sure to that.

if !dir.try_lock_exclusive()? {
return Err(fs4::lock_contended_error());
}

// Holds open segments in the directory.
let mut open_segments: Vec<OpenSegment> = Vec::new();
Expand Down