diff options
| -rw-r--r-- | tvix/Cargo.lock | 10 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 27 | ||||
| -rw-r--r-- | tvix/store/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 27 |
4 files changed, 60 insertions, 6 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index f2c1891b7fcd..d1a31b08a590 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -2117,6 +2117,15 @@ dependencies = [ ] [[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2433,6 +2442,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.48.0", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 750dee2bb284..4089008aaad6 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -6092,6 +6092,23 @@ rec { "loom" = [ "dep:loom" ]; }; }; + "signal-hook-registry" = rec { + crateName = "signal-hook-registry"; + version = "1.4.1"; + edition = "2015"; + sha256 = "18crkkw5k82bvcx088xlf5g4n3772m24qhzgfan80nda7d3rn8nq"; + authors = [ + "Michal 'vorner' Vaner <vorner@vorner.cz>" + "Masaki Hara <ackie.h.gmai@gmail.com>" + ]; + dependencies = [ + { + name = "libc"; + packageId = "libc"; + } + ]; + + }; "slab" = rec { crateName = "slab"; version = "0.4.8"; @@ -6925,6 +6942,12 @@ rec { packageId = "pin-project-lite"; } { + name = "signal-hook-registry"; + packageId = "signal-hook-registry"; + optional = true; + target = { target, features }: (target."unix" or false); + } + { name = "socket2"; packageId = "socket2"; optional = true; @@ -6987,7 +7010,7 @@ rec { "tracing" = [ "dep:tracing" ]; "windows-sys" = [ "dep:windows-sys" ]; }; - resolvedDefaultFeatures = [ "bytes" "default" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "rt" "rt-multi-thread" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; + resolvedDefaultFeatures = [ "bytes" "default" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "time" "tokio-macros" "windows-sys" ]; }; "tokio-io-timeout" = rec { crateName = "tokio-io-timeout"; @@ -8363,7 +8386,7 @@ rec { { name = "tokio"; packageId = "tokio"; - features = [ "rt-multi-thread" "net" ]; + features = [ "net" "rt-multi-thread" "signal" ]; } { name = "tokio-stream"; diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 0dcada31a61e..dece06be8fb4 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -17,7 +17,7 @@ sha2 = "0.10.6" sled = { version = "0.34.7", features = ["compression"] } thiserror = "1.0.38" tokio-stream = "0.1.14" -tokio = { version = "1.28.0", features = ["rt-multi-thread", "net"] } +tokio = { version = "1.28.0", features = ["net", "rt-multi-thread", "signal"] } tonic = "0.8.2" tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = ["json"] } diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index d2a8927351f9..c11af5765bd9 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -264,16 +264,37 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { directory_service.clone(), )?; - tokio::task::spawn_blocking(move || { + let mut fuse_session = tokio::task::spawn_blocking(move || { let f = FUSE::new( blob_service, directory_service, path_info_service, list_root, ); - fuser::mount2(f, &dest, &[]) + + fuser::Session::new(f, &dest, &[]) + }) + .await??; + + // grab a handle to unmount the file system, and register a signal + // handler. + let mut fuse_unmounter = fuse_session.unmount_callable(); + tokio::spawn(async move { + tokio::signal::ctrl_c().await.unwrap(); + info!("interrupt received, unmounting…"); + fuse_unmounter.unmount().unwrap(); + }); + + // Start the fuse filesystem and wait for its completion, which + // happens when it's unmounted externally, or via the signal handler + // task. + tokio::task::spawn_blocking(move || -> io::Result<()> { + info!("mounting tvix-store on {:?}", fuse_session.mountpoint()); + let res = fuse_session.run()?; + info!("unmount occured, terminating…"); + Ok(res) }) - .await?? + .await??; } }; Ok(()) |