diff options
| author | Florian Klink <flokli@flokli.de> | 2024-06-16T07·43+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2024-06-16T12·02+0000 |
| commit | 4be250109cb5df976cb137a3f631bc9f23faa952 (patch) | |
| tree | 34e8fae342fafb898ed29d8e2c08b8da917c884c /tvix/store/src/bin/tvix-store.rs | |
| parent | 7e42b4f314c2136366c4456f2af894108e765abf (diff) | |
refactor(tvix/store): drop FUSE multithread workaround for Darwin r/8286
The underlying issue in macFUSE has been fixed in https://github.com/osxfuse/osxfuse/issues/974. Bump our `macfuse` in nixpkgs to a version containing the fix. This can be removed while our nixpkgs pin is bumped past https://github.com/NixOS/nixpkgs/pull/320197. Change-Id: Ia0e644fb13198e45018b0a218647ef211acf4df1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11824 Tested-by: BuildkiteCI Reviewed-by: Brian Olsen <me@griff.name>
Diffstat (limited to '')
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index 4353cbdd03..9e81e59f12 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -185,19 +185,12 @@ enum Commands { }, } -#[cfg(all(feature = "fuse", not(target_os = "macos")))] +#[cfg(feature = "fuse")] fn default_threads() -> usize { std::thread::available_parallelism() .map(|threads| threads.into()) .unwrap_or(4) } -// On MacFUSE only a single channel will receive ENODEV when the file system is -// unmounted and so all the other channels will block forever. -// See https://github.com/osxfuse/osxfuse/issues/974 -#[cfg(all(feature = "fuse", target_os = "macos"))] -fn default_threads() -> usize { - 1 -} #[instrument(fields(indicatif.pb_show=1), skip(cli))] async fn run_cli(cli: Cli) -> Result<(), Box<dyn std::error::Error>> { |