fix: some issues in 2.2

.github/workflows/smoke.yml

@@ -125,7 +125,7 @@ jobs:
           export NYDUS_NYDUSIFY_$version_export=/usr/bin/nydus-$version/nydusify
         done
 
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.51.2
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.57.1
         sudo -E make smoke-only
 
   nydus-unit-test:

Cargo.toml

@@ -42,7 +42,7 @@ indexmap = "1"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4.8"
-mio = { version = "0.8", features = ["os-poll", "os-ext"] }
+mio = { version = "0.8.11", features = ["os-poll", "os-ext"] }
 nix = "0.24.0"
 rlimit = "0.9.0"
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
@@ -97,4 +97,4 @@ backend-registry = ["nydus-storage/backend-registry"]
 backend-s3 = ["nydus-storage/backend-s3"]
 
 [workspace]
-members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
+members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]

service/src/daemon.rs

@@ -416,13 +416,16 @@ impl DaemonController {
         self.fs_service.lock().unwrap().clone()
     }
 
-    /// Shutdown all services managed by the controller.
-    pub fn shutdown(&self) {
+    /// Notify controller shutdown
+    pub fn notify_shutdown(&self) {
         // Marking exiting state.
         self.active.store(false, Ordering::Release);
         // Signal the `run_loop()` working thread to exit.
         let _ = self.waker.wake();
+    }
 
+    /// Shutdown all services managed by the controller.
+    pub fn shutdown(&self) {
         let daemon = self.daemon.lock().unwrap().take();
         if let Some(d) = daemon {
             if let Err(e) = d.trigger_stop() {

smoke/tests/tool/context.go

@@ -105,6 +105,6 @@ func (ctx *Context) PrepareWorkDir(t *testing.T) {
 	}
 }
 
-func (ctx *Context) Destroy(t *testing.T) {
+func (ctx *Context) Destroy(_ *testing.T) {
 	os.RemoveAll(ctx.Env.WorkDir)
 }

smoke/tests/tool/iterator.go

@@ -129,10 +129,9 @@ func (c *DescartesIterator) calNext() {
 				carried = true
 				cursors[idx]++
 				break
-			} else {
-				carried = false
-				cursors[idx] = 0
 			}
+			carried = false
+			cursors[idx] = 0
 		}
 		if !carried {
 			c.noNext()

smoke/tests/tool/layer.go

@@ -191,7 +191,7 @@ func (l *Layer) PackRef(t *testing.T, ctx Context, blobDir string, compress bool
 	return ociBlobDigest, rafsBlobDigest
 }
 
-func (l *Layer) Overlay(t *testing.T, upper *Layer) *Layer {
+func (l *Layer) Overlay(_ *testing.T, upper *Layer) *Layer {
 	// Handle whiteout/opaque files
 	for upperName := range upper.FileTree {
 		name := filepath.Base(upperName)
@@ -231,14 +231,14 @@ func (l *Layer) Overlay(t *testing.T, upper *Layer) *Layer {
 
 func (l *Layer) recordFileTree(t *testing.T) {
 	l.FileTree = map[string]*File{}
-	filepath.Walk(l.workDir, func(path string, fi os.FileInfo, err error) error {
+	filepath.Walk(l.workDir, func(path string, _ os.FileInfo, _ error) error {
 		targetPath := l.TargetPath(t, path)
 		l.FileTree[targetPath] = NewFile(t, path, targetPath)
 		return nil
 	})
 }
 
-func (l *Layer) toOCITar(t *testing.T) io.ReadCloser {
+func (l *Layer) toOCITar(_ *testing.T) io.ReadCloser {
 	return archive.Diff(context.Background(), "", l.workDir)
 }
 

smoke/tests/tool/verify.go

@@ -43,7 +43,7 @@ func Verify(t *testing.T, ctx Context, expectedFiles map[string]*File) {
 	}()
 
 	actualFiles := map[string]*File{}
-	err = filepath.WalkDir(ctx.Env.MountDir, func(path string, entry fs.DirEntry, err error) error {
+	err = filepath.WalkDir(ctx.Env.MountDir, func(path string, _ fs.DirEntry, err error) error {
 		require.Nil(t, err)
 
 		targetPath, err := filepath.Rel(ctx.Env.MountDir, path)