fusemanager: resolve review comments

Signed-off-by: Shuo Wang <[email protected]>

Author: wswsmao

cmd/containerd-stargz-grpc/fsopts/fsopts.go

@@ -51,6 +51,7 @@ func ConfigFsOpts(ctx context.Context, rootDir string, config *Config) ([]fs.Opt
 	mt, err := getMetadataStore(rootDir, config)
 	if err != nil {
 		log.G(ctx).WithError(err).Fatalf("failed to configure metadata store")
+		return nil, err
 	}
 	fsOpts = append(fsOpts, fs.WithMetadataStore(mt))
 

cmd/containerd-stargz-grpc/main.go

@@ -159,11 +159,11 @@ func main() {
 		}
 		fmAddr := config.FuseManagerAddress
 		if fmAddr == "" {
-			var err error
-			fmAddr, err = exec.LookPath(fuseManagerAddress)
-			if err != nil {
-				fmAddr = defaultFuseManagerAddress
-			}
+			fmAddr = defaultFuseManagerAddress
+		}
+
+		if !filepath.IsAbs(fmAddr) {
+			log.G(ctx).WithError(err).Fatalf("fuse manager address must be an absolute path: %s", fmAddr)
 		}
 		err := service.StartFuseManager(ctx, fmPath, fmAddr, filepath.Join(*rootDir, "fusestore.db"), *logLevel, filepath.Join(*rootDir, "stargz-fuse-manager.log"))
 		if err != nil {

cmd/go.mod

@@ -22,7 +22,6 @@ require (
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/opencontainers/runtime-spec v1.2.0
 	github.com/pelletier/go-toml v1.9.5
-	github.com/pkg/errors v0.9.1
 	github.com/rs/xid v1.6.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/urfave/cli/v2 v2.27.5

cmd/stargz-fuse-manager/fusemanager/fusemanager.go

@@ -29,7 +29,6 @@ import (
 	"syscall"
 
 	"github.com/containerd/log"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"google.golang.org/grpc"
@@ -136,10 +135,10 @@ func startNew(ctx context.Context, logPath, address, fusestore, logLevel string)
 
 	if ready, err := waitUntilReady(ctx); err != nil || !ready {
 		if err != nil {
-			return errors.Wrapf(err, "failed to start new fusemanager")
+			return fmt.Errorf("failed to start new fusemanager: %w", err)
 		}
 		if !ready {
-			return errors.Errorf("failed to start new fusemanager, fusemanager not ready")
+			return fmt.Errorf("failed to start new fusemanager, fusemanager not ready")
 		}
 	}
 
@@ -170,6 +169,7 @@ func runFuseManager(ctx context.Context) error {
 	lvl, err := logrus.ParseLevel(logLevel)
 	if err != nil {
 		log.L.WithError(err).Fatal("failed to prepare logger")
+		return err
 	}
 
 	logrus.SetLevel(lvl)

cmd/stargz-fuse-manager/fusemanager/service.go

@@ -29,7 +29,6 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/moby/sys/mountinfo"
-	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 	"google.golang.org/grpc"
 
@@ -48,9 +47,9 @@ const (
 
 type Config struct {
 	Config                     *service.Config
-	IPFS                       bool
-	MetadataStore              string
-	DefaultImageServiceAddress string
+	IPFS                       bool   `toml:"ipfs"`
+	MetadataStore              string `toml:"metadata_store" default:"memory"`
+	DefaultImageServiceAddress string `json:"default_image_service_address"`
 }
 
 type Server struct {
@@ -78,12 +77,12 @@ type Server struct {
 
 func NewFuseManager(ctx context.Context, listener net.Listener, server *grpc.Server, fuseStoreAddr string) (*Server, error) {
 	if err := os.MkdirAll(filepath.Dir(fuseStoreAddr), 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to create directory %q", filepath.Dir(fuseStoreAddr))
+		return nil, fmt.Errorf("failed to create directory %q: %w", filepath.Dir(fuseStoreAddr), err)
 	}
 
 	db, err := bolt.Open(fuseStoreAddr, 0666, &bolt.Options{Timeout: 10 * time.Second, ReadOnly: false})
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to configure fusestore")
+		return nil, fmt.Errorf("failed to configure fusestore: %w", err)
 	}
 
 	fm := &Server{
@@ -139,6 +138,7 @@ func (fm *Server) Init(ctx context.Context, req *pb.InitRequest) (*pb.Response,
 	credsFuncs, err := keychainconfig.ConfigKeychain(ctx, fm.server, &keyChainConfig)
 	if err != nil {
 		log.G(ctx).WithError(err).Fatalf("failed to configure keychain")
+		return &pb.Response{}, err
 	}
 
 	fsConfig := fsopts.Config{
@@ -148,6 +148,7 @@ func (fm *Server) Init(ctx context.Context, req *pb.InitRequest) (*pb.Response,
 	fsOpts, err := fsopts.ConfigFsOpts(ctx, fm.root, &fsConfig)
 	if err != nil {
 		log.G(ctx).WithError(err).Fatalf("failed to configure fs config")
+		return &pb.Response{}, err
 	}
 
 	opts := []service.Option{service.WithCredsFuncs(credsFuncs...), service.WithFilesystemOptions(fsOpts...)}

service/service.go

@@ -72,6 +72,7 @@ func NewStargzSnapshotterService(ctx context.Context, root string, config *Confi
 	fs, err := NewFileSystem(ctx, root, config, opts...)
 	if err != nil {
 		log.G(ctx).WithError(err).Fatalf("failed to configure filesystem")
+		return nil, err
 	}
 
 	var snapshotter snapshots.Snapshotter
@@ -84,6 +85,7 @@ func NewStargzSnapshotterService(ctx context.Context, root string, config *Confi
 	snapshotter, err = snbase.NewSnapshotter(ctx, snapshotterRoot(root), fs, snOpts...)
 	if err != nil {
 		log.G(ctx).WithError(err).Fatalf("failed to create new snapshotter")
+		return nil, err
 	}
 
 	return snapshotter, err