Merge branch 'master' into github/version

dragonflyoss · Aug 7, 2023 · d068d7a · d068d7a
2 parents 654771d + f419349
commit d068d7a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -287,6 +287,12 @@ $ cat localfs.json
       "config": {
         "dir": "/<YOUR-WORK-PATH>/nydus-image/blobs"
       }
+    },
+    "cache": {
+      "type": "blobcache",
+      "config": {
+        "work_dir": "/var/lib/nydus/cache"
+      }
     }
   },
   "mode": "direct"

diff --git a/service/src/fusedev.rs b/service/src/fusedev.rs
@@ -591,15 +591,21 @@ pub fn create_fuse_daemon(
         || api_sock.is_none()
     {
         if let Some(cmd) = mount_cmd {
-            daemon.service.mount(cmd)?;
+            daemon.service.mount(cmd).map_err(|e| {
+                error!("service mount error: {}", &e);
+                eother!(e)
+            })?;
         }
         daemon
             .service
             .session
             .lock()
             .unwrap()
             .mount()
-            .map_err(|e| eother!(e))?;
+            .map_err(|e| {
+                error!("service session mount error: {}", &e);
+                eother!(e)
+            })?;
         daemon
             .on_event(DaemonStateMachineInput::Mount)
             .map_err(|e| eother!(e))?;