fusemanager: mv fusemanager to repo root

wswsmao · ilyee · wswsmao · commit ffc8b6591b80 · 2024-12-12T17:09:26.000+08:00
Signed-off-by: abushwang &lt;abushwangs@gmail.com&gt;
Co-authored-by: Zuti He &lt;ilyeeelihe@gmail.com&gt;
diff --git a/cmd/containerd-stargz-grpc/fsopts/fsopts.go b/cmd/containerd-stargz-grpc/fsopts/fsopts.go
@@ -50,8 +50,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
+		return nil, fmt.Errorf("failed to configure metadata store: %w", err)
 	}
 	fsOpts = append(fsOpts, fs.WithMetadataStore(mt))
 
diff --git a/cmd/containerd-stargz-grpc/main.go b/cmd/containerd-stargz-grpc/main.go
@@ -36,7 +36,7 @@ import (
 	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/log"
 	"github.com/containerd/stargz-snapshotter/cmd/containerd-stargz-grpc/fsopts"
-	"github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager"
+	"github.com/containerd/stargz-snapshotter/fusemanager"
 	"github.com/containerd/stargz-snapshotter/service"
 	"github.com/containerd/stargz-snapshotter/service/keychain/keychainconfig"
 	snbase "github.com/containerd/stargz-snapshotter/snapshot"
@@ -165,7 +165,7 @@ func main() {
 		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"))
+		err := fusemanager.StartFuseManager(ctx, fmPath, fmAddr, filepath.Join(*rootDir, "fusestore.db"), *logLevel, filepath.Join(*rootDir, "stargz-fuse-manager.log"))
 		if err != nil {
 			log.G(ctx).WithError(err).Fatalf("failed to start fusemanager")
 		}
diff --git a/cmd/go.mod b/cmd/go.mod
@@ -14,16 +14,13 @@ require (
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/docker/go-metrics v0.0.1
 	github.com/goccy/go-json v0.10.3
-	github.com/gogo/protobuf v1.3.2
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/klauspost/compress v1.17.11
-	github.com/moby/sys/mountinfo v0.7.2
 	github.com/opencontainers/go-digest v1.0.0
 	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/rs/xid v1.6.0
-	github.com/sirupsen/logrus v1.9.3
 	github.com/urfave/cli/v2 v2.27.5
 	go.etcd.io/bbolt v1.3.11
 	golang.org/x/sync v0.9.0
@@ -67,6 +64,7 @@ require (
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
@@ -89,6 +87,7 @@ require (
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/sys/mountinfo v0.7.2 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/sys/signal v0.7.1 // indirect
 	github.com/moby/sys/symlink v0.3.0 // indirect
@@ -107,11 +106,13 @@ require (
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
 	github.com/opencontainers/selinux v1.11.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
diff --git a/cmd/stargz-fuse-manager/main.go b/cmd/stargz-fuse-manager/main.go
@@ -17,9 +17,41 @@
 package main
 
 import (
-	fusemanager "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager"
+	"github.com/containerd/stargz-snapshotter/cmd/containerd-stargz-grpc/fsopts"
+	fusemanager "github.com/containerd/stargz-snapshotter/fusemanager"
+	"github.com/containerd/stargz-snapshotter/service"
+	"github.com/containerd/stargz-snapshotter/service/keychain/keychainconfig"
 )
 
+func init() {
+	fusemanager.RegisterConfigFunc(func(cc *fusemanager.ConfigContext) ([]service.Option, error) {
+		fsConfig := fsopts.Config{
+			EnableIpfs:    cc.Config.IPFS,
+			MetadataStore: cc.Config.MetadataStore,
+		}
+		fsOpts, err := fsopts.ConfigFsOpts(cc.Ctx, cc.RootDir, &fsConfig)
+		if err != nil {
+			return nil, err
+		}
+		return []service.Option{service.WithFilesystemOptions(fsOpts...)}, nil
+	})
+
+	fusemanager.RegisterConfigFunc(func(cc *fusemanager.ConfigContext) ([]service.Option, error) {
+		keyChainConfig := keychainconfig.Config{
+			EnableKubeKeychain:         cc.Config.Config.KubeconfigKeychainConfig.EnableKeychain,
+			EnableCRIKeychain:          cc.Config.Config.CRIKeychainConfig.EnableKeychain,
+			KubeconfigPath:             cc.Config.Config.KubeconfigKeychainConfig.KubeconfigPath,
+			DefaultImageServiceAddress: cc.Config.DefaultImageServiceAddress,
+			ImageServicePath:           cc.Config.Config.CRIKeychainConfig.ImageServicePath,
+		}
+		credsFuncs, err := keychainconfig.ConfigKeychain(cc.Ctx, cc.Server, &keyChainConfig)
+		if err != nil {
+			return nil, err
+		}
+		return []service.Option{service.WithCredsFuncs(credsFuncs...)}, nil
+	})
+}
+
 func main() {
 	fusemanager.Run()
 }
diff --git a/fusemanager/api/api.pb.go b/fusemanager/api/api.pb.go
diff --git a/fusemanager/api/api.proto b/fusemanager/api/api.proto
diff --git a/fusemanager/api/generate.go b/fusemanager/api/generate.go
diff --git a/fusemanager/client.go b/fusemanager/client.go
@@ -28,7 +28,7 @@ import (
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
 
-	pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
+	pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
 	"github.com/containerd/stargz-snapshotter/snapshot"
 )
 
diff --git a/fusemanager/fusemanager.go b/fusemanager/fusemanager.go
@@ -33,7 +33,7 @@ import (
 	"golang.org/x/sys/unix"
 	"google.golang.org/grpc"
 
-	pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
+	pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
 	"github.com/containerd/stargz-snapshotter/version"
 )
 
@@ -234,3 +234,36 @@ func runFuseManager(ctx context.Context) error {
 
 	return err
 }
+
+func StartFuseManager(ctx context.Context, executable, address, fusestore, logLevel, logPath string) error {
+	// if socket exists, do not start it
+	if _, err := os.Stat(address); err == nil {
+		return nil
+	} else if !os.IsNotExist(err) {
+		return err
+	}
+
+	if _, err := os.Stat(executable); err != nil {
+		log.G(ctx).WithError(err).Errorf("failed to stat fusemanager binary: %s", executable)
+		return err
+	}
+
+	args := []string{
+		"-action", "start",
+		"-address", address,
+		"-fusestore-path", fusestore,
+		"-log-level", logLevel,
+		"-log-path", logPath,
+	}
+
+	cmd := exec.Command(executable, args...)
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/fusemanager/fusestore.go b/fusemanager/fusestore.go
diff --git a/fusemanager/service.go b/fusemanager/service.go
@@ -32,10 +32,8 @@ import (
 	bolt "go.etcd.io/bbolt"
 	"google.golang.org/grpc"
 
-	"github.com/containerd/stargz-snapshotter/cmd/containerd-stargz-grpc/fsopts"
-	pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
+	pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
 	"github.com/containerd/stargz-snapshotter/service"
-	"github.com/containerd/stargz-snapshotter/service/keychain/keychainconfig"
 	"github.com/containerd/stargz-snapshotter/snapshot"
 )
 
@@ -52,6 +50,26 @@ type Config struct {
 	DefaultImageServiceAddress string `json:"default_image_service_address"`
 }
 
+type ConfigContext struct {
+	Ctx     context.Context
+	Config  *Config
+	RootDir string
+	Server  *grpc.Server
+}
+
+var (
+	configFuncs []ConfigFunc
+	configMu    sync.Mutex
+)
+
+type ConfigFunc func(cc *ConfigContext) ([]service.Option, error)
+
+func RegisterConfigFunc(f ConfigFunc) {
+	configMu.Lock()
+	defer configMu.Unlock()
+	configFuncs = append(configFuncs, f)
+}
+
 type Server struct {
 	pb.UnimplementedStargzFuseManagerServiceServer
 
@@ -126,33 +144,23 @@ func (fm *Server) Init(ctx context.Context, req *pb.InitRequest) (*pb.Response,
 	fm.root = req.Root
 	fm.config = config
 
-	// Configure keychain
-	keyChainConfig := keychainconfig.Config{
-		EnableKubeKeychain:         config.Config.KubeconfigKeychainConfig.EnableKeychain,
-		EnableCRIKeychain:          config.Config.CRIKeychainConfig.EnableKeychain,
-		KubeconfigPath:             config.Config.KubeconfigKeychainConfig.KubeconfigPath,
-		DefaultImageServiceAddress: config.DefaultImageServiceAddress,
-		ImageServicePath:           config.Config.CRIKeychainConfig.ImageServicePath,
-	}
-
-	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
+	cc := &ConfigContext{
+		Ctx:     ctx,
+		Config:  fm.config,
+		RootDir: fm.root,
+		Server:  fm.server,
 	}
 
-	fsConfig := fsopts.Config{
-		EnableIpfs:    config.IPFS,
-		MetadataStore: config.MetadataStore,
-	}
-	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
+	var opts []service.Option
+	for _, configFunc := range configFuncs {
+		funcOpts, err := configFunc(cc)
+		if err != nil {
+			log.G(ctx).WithError(err).Errorf("failed to apply config function")
+			return &pb.Response{}, err
+		}
+		opts = append(opts, funcOpts...)
 	}
 
-	opts := []service.Option{service.WithCredsFuncs(credsFuncs...), service.WithFilesystemOptions(fsOpts...)}
-
 	fs, err := service.NewFileSystem(ctx, fm.root, fm.config.Config, opts...)
 	if err != nil {
 		return &pb.Response{}, err
diff --git a/go.mod b/go.mod
@@ -26,6 +26,8 @@ require (
 	github.com/opencontainers/runtime-spec v1.2.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/rs/xid v1.6.0
+	github.com/sirupsen/logrus v1.9.3
+	go.etcd.io/bbolt v1.3.11
 	golang.org/x/sync v0.9.0
 	golang.org/x/sys v0.26.0
 	google.golang.org/grpc v1.68.0
@@ -90,15 +92,13 @@ require (
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/urfave/cli/v2 v2.27.5 // indirect
 	github.com/vbatts/tar-split v0.11.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	go.etcd.io/bbolt v1.3.11 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
 	go.opentelemetry.io/otel v1.31.0 // indirect
diff --git a/service/service.go b/service/service.go
@@ -18,8 +18,6 @@ package service
 
 import (
 	"context"
-	"os"
-	"os/exec"
 	"path/filepath"
 
 	"github.com/containerd/containerd/v2/core/snapshots"
@@ -129,39 +127,6 @@ func NewFileSystem(ctx context.Context, root string, config *Config, opts ...Opt
 	return fs, nil
 }
 
-func StartFuseManager(ctx context.Context, executable, address, fusestore, logLevel, logPath string) error {
-	// if socket exists, do not start it
-	if _, err := os.Stat(address); err == nil {
-		return nil
-	} else if !os.IsNotExist(err) {
-		return err
-	}
-
-	if _, err := os.Stat(executable); err != nil {
-		log.G(ctx).WithError(err).Errorf("failed to stat fusemanager binary: %s", executable)
-		return err
-	}
-
-	args := []string{
-		"-action", "start",
-		"-address", address,
-		"-fusestore-path", fusestore,
-		"-log-level", logLevel,
-		"-log-path", logPath,
-	}
-
-	cmd := exec.Command(executable, args...)
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	if err := cmd.Wait(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func snapshotterRoot(root string) string {
 	return filepath.Join(root, "snapshotter")
 }

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ func ConfigFsOpts(ctx context.Context, rootDir string, config *Config) ([]fs.Opt`
`50`	`50`
`51`	`51`	`mt, err := getMetadataStore(rootDir, config)`
`52`	`52`	`if err != nil {`
`53`		`- log.G(ctx).WithError(err).Fatalf("failed to configure metadata store")`
`54`		`- return nil, err`
	`53`	`+ return nil, fmt.Errorf("failed to configure metadata store: %w", err)`
`55`	`54`	`}`
`56`	`55`	`fsOpts = append(fsOpts, fs.WithMetadataStore(mt))`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"google.golang.org/grpc/backoff"`
`29`	`29`	`"google.golang.org/grpc/credentials/insecure"`
`30`	`30`
`31`		`- pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"`
	`31`	`+ pb "github.com/containerd/stargz-snapshotter/fusemanager/api"`
`32`	`32`	`"github.com/containerd/stargz-snapshotter/snapshot"`
`33`	`33`	`)`
`34`	`34`