feat: add ofs ctrl-c exit unmount hook

bin/ofs/Cargo.toml

@@ -41,6 +41,7 @@ tokio = { version = "1.34", features = [
   "macros",
   "rt-multi-thread",
   "io-std",
+  "signal",
 ] }
 url = "2.5.0"
 chrono = "0.4.34"
@@ -49,7 +50,7 @@ bytes = "1.5.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2.151"
-fuse3 = { "version" = "0.6.1", "features" = ["tokio-runtime", "unprivileged"] }
+fuse3 = { "version" = "0.7.1", "features" = ["tokio-runtime", "unprivileged"] }
 nix = { version = "0.27.1", features = ["user"] }
 
 [features]

bin/ofs/src/fuse.rs

@@ -17,13 +17,13 @@
 
 use std::ffi::OsStr;
 use std::ffi::OsString;
+use std::num::NonZeroU32;
 use std::ops::Deref;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::time::SystemTime;
 
 use bytes::Bytes;
-use fuse3::async_trait;
 use fuse3::path::prelude::*;
 use fuse3::Errno;
 use fuse3::Result;
@@ -127,14 +127,15 @@ impl Fuse {
     }
 }
 
-#[async_trait]
 impl PathFilesystem for Fuse {
-    type DirEntryStream = BoxStream<'static, Result<DirectoryEntry>>;
-    type DirEntryPlusStream = BoxStream<'static, Result<DirectoryEntryPlus>>;
+    type DirEntryStream<'a> = BoxStream<'a, Result<DirectoryEntry>>;
+    type DirEntryPlusStream<'a> = BoxStream<'a, Result<DirectoryEntryPlus>>;
 
     // Init a fuse filesystem
-    async fn init(&self, _req: Request) -> Result<()> {
-        Ok(())
+    async fn init(&self, _req: Request) -> Result<ReplyInit> {
+        Ok(ReplyInit {
+            max_write: NonZeroU32::new(16 * 1024).unwrap(),
+        })
     }
 
     // Callback when fs is being destroyed
@@ -474,6 +475,7 @@ impl PathFilesystem for Fuse {
         fh: u64,
         offset: u64,
         data: &[u8],
+        _write_flags: u32,
         flags: u32,
     ) -> Result<ReplyWrite> {
         log::debug!(
@@ -508,13 +510,13 @@ impl PathFilesystem for Fuse {
         })
     }
 
-    async fn readdir(
-        &self,
+    async fn readdir<'a>(
+        &'a self,
         _req: Request,
-        path: &OsStr,
+        path: &'a OsStr,
         fh: u64,
         offset: i64,
-    ) -> Result<ReplyDirectory<Self::DirEntryStream>> {
+    ) -> Result<ReplyDirectory<Self::DirEntryStream<'a>>> {
         log::debug!("readdir(path={:?}, fh={}, offset={})", path, fh, offset);
 
         let mut current_dir = PathBuf::from(path);
@@ -565,14 +567,14 @@ impl PathFilesystem for Fuse {
         Ok(())
     }
 
-    async fn readdirplus(
-        &self,
+    async fn readdirplus<'a>(
+        &'a self,
         _req: Request,
-        parent: &OsStr,
+        parent: &'a OsStr,
         fh: u64,
         offset: u64,
         _lock_owner: u64,
-    ) -> Result<ReplyDirectoryPlus<Self::DirEntryPlusStream>> {
+    ) -> Result<ReplyDirectoryPlus<Self::DirEntryPlusStream<'a>>> {
         log::debug!(
             "readdirplus(parent={:?}, fh={}, offset={})",
             parent,

bin/ofs/src/lib.rs

@@ -22,6 +22,7 @@ use anyhow::anyhow;
 use anyhow::Result;
 use opendal::Operator;
 use opendal::Scheme;
+use tokio::signal;
 
 pub mod config;
 pub use config::Config;
@@ -83,11 +84,18 @@ async fn execute_inner(args: Args) -> Result<()> {
 
     let adapter = fuse::Fuse::new(args.backend, uid.into(), gid.into());
 
-    let mount_handle = Session::new(mount_option)
+    let mut mount_handle = Session::new(mount_option)
         .mount_with_unprivileged(adapter, args.mount_path)
         .await?;
 
-    mount_handle.await?;
+    let handle = &mut mount_handle;
+
+    tokio::select! {
+        res = handle => res?,
+        _ = signal::ctrl_c() => {
+            mount_handle.unmount().await?
+        }
+    }
 
     Ok(())
 }