Skip to content
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.

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

Introduce FileHandle #1063

Merged
merged 10 commits into from
Oct 29, 2024
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
3 changes: 3 additions & 0 deletions lading/proptest-regressions/generator/file_gen/model.txt

Large diffs are not rendered by default.

72 changes: 63 additions & 9 deletions lading/src/bin/logrotate_fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use tracing_subscriber::{fmt::format::FmtSpan, util::SubscriberInitExt};
use nix::libc::{self, ENOENT};
use serde::Deserialize;
use std::{
collections::HashMap,
ffi::OsStr,
num::NonZeroU32,
path::PathBuf,
Expand Down Expand Up @@ -83,6 +84,8 @@ const TTL: Duration = Duration::from_secs(1); // Attribute cache timeout
#[derive(Debug)]
struct LogrotateFS {
state: Arc<Mutex<model::State>>,
open_files: Arc<Mutex<HashMap<u64, model::FileHandle>>>,

start_time: std::time::Instant,
start_time_system: std::time::SystemTime,
}
Expand Down Expand Up @@ -189,7 +192,7 @@ impl Filesystem for LogrotateFS {
&mut self,
_req: &Request,
ino: u64,
_fh: u64,
fh: u64,
offset: i64,
size: u32,
_flags: i32,
Expand All @@ -199,13 +202,51 @@ impl Filesystem for LogrotateFS {
let tick = self.get_current_tick();
let mut state = self.state.lock().expect("lock poisoned");

// NOTE this call to State::read is almost surely allocating. It'd be
// pretty slick if we could get the buffer directly from the OS to pass
// down for writing but we can't. I suppose we could send up the raw
// blocks and then chain them together as needed but absent a compelling
// reason to do that the simplicity of this API is nice.
if let Some(data) = state.read(ino as usize, offset as usize, size as usize, tick) {
reply.data(&data);
// Get the FileHandle from fh
let file_handle = {
let open_files = self.open_files.lock().expect("lock poisoned");
open_files.get(&fh).cloned()
};

if let Some(file_handle) = file_handle {
assert!(
file_handle.inode() as u64 == ino,
"file handle inode and passed ino do not match"
);
if let Some(data) = state.read(file_handle, offset as usize, size as usize, tick) {
reply.data(&data);
} else {
reply.error(ENOENT);
}
} else {
reply.error(ENOENT);
}
}

#[tracing::instrument(skip(self, _req, reply))]
fn release(
&mut self,
_req: &Request,
_ino: u64,
fh: u64,
_flags: i32,
_lock_owner: Option<u64>,
_flush: bool,
reply: fuser::ReplyEmpty,
) {
let tick = self.get_current_tick();
let mut state = self.state.lock().expect("lock poisoned");

// Remove the FileHandle from the mapping
let file_handle = {
let mut open_files = self.open_files.lock().expect("lock poisoned");
open_files.remove(&fh)
};

if let Some(file_handle) = file_handle {
// Close the file in the state
state.close_file(tick, file_handle);
reply.ok();
} else {
reply.error(ENOENT);
}
Expand Down Expand Up @@ -276,7 +317,19 @@ impl Filesystem for LogrotateFS {

#[tracing::instrument(skip(self, _req, reply))]
fn open(&mut self, _req: &Request, ino: u64, flags: i32, reply: fuser::ReplyOpen) {
reply.opened(ino, flags as u32);
let tick = self.get_current_tick();
let mut state = self.state.lock().expect("lock poisoned");

if let Some(file_handle) = state.open_file(tick, ino as usize) {
let fh = file_handle.id();
{
let mut open_files = self.open_files.lock().expect("lock poisoned");
open_files.insert(fh, file_handle);
}
reply.opened(fh, flags as u32);
} else {
reply.error(ENOENT);
}
}
}

Expand Down Expand Up @@ -321,6 +374,7 @@ fn main() -> Result<(), Error> {
// Initialize the FUSE filesystem
let fs = LogrotateFS {
state: Arc::new(Mutex::new(state)),
open_files: Arc::new(Mutex::new(HashMap::new())),
start_time: std::time::Instant::now(),
start_time_system: std::time::SystemTime::now(),
};
Expand Down
Loading
Loading