maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/store): Fix FUSE support on MacOS

Browse source 
This partially fixes b/312 and gets FUSE to work again on MacOS.

It is mostly small type changes and an update to fuse-backend-rs because
upstream currently doesn't work with MacFuse. It also sets the default
FUSE thread count on MacOS to 1 because otherwise the mount command will
hang when shutting down as only one thread gets ENODEV and all the others
just keep blocking.

Change-Id: Ifb3c4268caf296c487049c1dc4618acb32497f44
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9490
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Brian Olsen 2023-09-29 18:50:50 +02:00 • committed by Brian Olsen
parent 5c2cad0ac4
commit cfb810d81a
9 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tvix/store/src/fs/mod.rs
View file

@ -13,6 +13,7 @@ mod tests;
use crate::pathinfoservice::PathInfoService;
use fuse_backend_rs::abi::fuse_abi::stat64;
use fuse_backend_rs::api::filesystem::{Context, FileSystem, FsOptions, ROOT_ID};
use futures::StreamExt;
use nix_compat::store_path::StorePath;
@ -253,7 +254,7 @@ impl FileSystem for TvixStoreFs {
_ctx: &Context,
inode: Self::Inode,
_handle: Option<Self::Handle>,
) -> io::Result<(libc::stat64, Duration)> {
) -> io::Result<(stat64, Duration)> {
if inode == ROOT_ID {
return Ok((ROOT_FILE_ATTR.into(), Duration::MAX));
}
@ -441,7 +442,7 @@ impl FileSystem for TvixStoreFs {
let written = add_entry(fuse_backend_rs::api::filesystem::DirEntry {
ino,
offset: offset + i as u64 + 1,
type_: ty,
type_: ty as u32,
name: store_path.to_string().as_bytes(),
})?;
// If the buffer is full, add_entry will return `Ok(0)`.
@ -490,9 +491,9 @@ impl FileSystem for TvixStoreFs {
ino: *ino,
offset: offset + i as u64 + 1,
type_: match child_node {
Node::Directory(_) => libc::S_IFDIR,
Node::File(_) => libc::S_IFREG,
Node::Symlink(_) => libc::S_IFLNK,
Node::Directory(_) => libc::S_IFDIR as u32,
Node::File(_) => libc::S_IFREG as u32,
Node::Symlink(_) => libc::S_IFLNK as u32,
},
name: child_node.get_name(),
})?;