add resource cleanup for fusemanager

Signed-off-by: abushwang <[email protected]>
containerd · Dec 9, 2024 · 5a4c3ff · 5a4c3ff
1 parent 2453b95
commit 5a4c3ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmd/stargz-fuse-manager/fusemanager/fusemanager.go b/cmd/stargz-fuse-manager/fusemanager/fusemanager.go
@@ -221,6 +221,7 @@ func runFuseManager(ctx context.Context) error {
 		sig := <-sigCh
 		log.G(ctx).Infof("Got %v", sig)
 		fm.server.Stop()
+		os.Remove(address)
 	}()
 
 	if err = server.Serve(l); err != nil {

diff --git a/cmd/stargz-fuse-manager/fusemanager/service.go b/cmd/stargz-fuse-manager/fusemanager/service.go
@@ -72,6 +72,8 @@ type Server struct {
 	// curFs is filesystem created by latest config
 	curFs snapshot.FileSystem
 	ms    *bolt.DB
+
+	fuseStoreAddr string
 }
 
 func NewFuseManager(ctx context.Context, listener net.Listener, server *grpc.Server, fuseStoreAddr string) (*Server, error) {
@@ -91,6 +93,7 @@ func NewFuseManager(ctx context.Context, listener net.Listener, server *grpc.Ser
 		ms:       db,
 		listener: listener,
 		server:   server,
+		fuseStoreAddr: fuseStoreAddr,
 	}
 
 	return fm, nil
@@ -278,6 +281,11 @@ func (fm *Server) Close(ctx context.Context) error {
 		return err
 	}
 
+	if err := os.Remove(fm.fuseStoreAddr); err != nil {
+		log.G(ctx).WithError(err).Errorf("failed to remove fusestore file %s", fm.fuseStoreAddr)
+		return err
+	}
+
 	return nil
 }