Support specifying content directory via root option

Signed-off-by: abushwang <abushwang@tencent.com>

Author: abushwang

cmd/soci/commands/internal/store.go

@@ -27,8 +27,10 @@ import (
 func ContentStoreOptions(ctx context.Context, cmd *cli.Command) []store.Option {
 	contentStore := cmd.String("content-store")
 	address := cmd.String("address")
+	root := cmd.String("root")
 	return []store.Option{
 		store.WithType(store.ContentStoreType(contentStore)),
 		store.WithContainerdAddress(address),
+		store.WithSnapshotterRoot(root),
 	}
 }

cmd/soci/commands/rebuild_db.go

@@ -54,7 +54,10 @@ var RebuildDBCommand = &cli.Command{
 		}
 
 		contentStoreType := cmd.String("content-store")
-		contentStorePath, err := store.GetContentStorePath(store.ContentStoreType(contentStoreType))
+		contentStorePath, err := store.GetContentStorePath(
+			store.ContentStoreType(contentStoreType),
+			cmd.String("root"),
+		)
 		if err != nil {
 			return err
 		}

fs/fs.go

@@ -250,6 +250,7 @@ func NewFilesystem(ctx context.Context, root string, cfg config.FSConfig, opts .
 		store.WithType(cfg.ContentStoreConfig.Type),
 		store.WithContainerdAddress(cfg.ContentStoreConfig.ContainerdAddress),
 		store.WithClient(client),
+		store.WithSnapshotterRoot(filepath.Dir(root)),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("cannot create content store: %w", err)

integration/pull_test.go

@@ -88,7 +88,7 @@ func TestOptimizeConsistentSociArtifact(t *testing.T) {
 	for _, tt := range tests {
 		for _, contentStoreType := range store.ContentStoreTypes() {
 			t.Run(tt.name+" with "+string(contentStoreType+" content store"), func(t *testing.T) {
-				contentStorePath, err := store.GetContentStorePath(contentStoreType)
+				contentStorePath, err := store.GetContentStorePath(contentStoreType, "")
 				if err != nil {
 					t.Fatalf("cannot get local content store path: %v", err)
 				}

soci/store/store.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"path/filepath"
 	"sync"
 	"time"
 
@@ -71,7 +72,7 @@ const (
 	DefaultContainerdContentStorePath = "/var/lib/containerd/io.containerd.content.v1.content"
 
 	// Default path to soci content addressable storage
-	DefaultSociContentStorePath = "/var/lib/soci-snapshotter-grpc/content"
+	DefaultSociContentStorePath = config.DefaultSociSnapshotterRootPath + "content"
 )
 
 func ErrUnknownContentStoreType(contentStoreType ContentStoreType) error {
@@ -122,7 +123,8 @@ func (c *ContainerdClient) Client() (*containerd.Client, error) {
 
 type ContentStoreConfig struct {
 	config.ContentStoreConfig
-	ctdClient *ContainerdClient
+	ctdClient       *ContainerdClient
+	SnapshotterRoot string
 }
 
 func NewStoreConfig(opts ...Option) ContentStoreConfig {
@@ -153,6 +155,12 @@ func WithContainerdAddress(address string) Option {
 	}
 }
 
+func WithSnapshotterRoot(root string) Option {
+	return func(sc *ContentStoreConfig) {
+		sc.SnapshotterRoot = root
+	}
+}
+
 func WithClient(client *ContainerdClient) Option {
 	return func(sc *ContentStoreConfig) {
 		sc.ctdClient = client
@@ -173,7 +181,7 @@ func CanonicalizeContentStoreType(contentStoreType ContentStoreType) (ContentSto
 }
 
 // GetContentStorePath returns the top level directory for the content store.
-func GetContentStorePath(contentStoreType ContentStoreType) (string, error) {
+func GetContentStorePath(contentStoreType ContentStoreType, root string) (string, error) {
 	contentStoreType, err := CanonicalizeContentStoreType(contentStoreType)
 	if err != nil {
 		return "", err
@@ -182,7 +190,10 @@ func GetContentStorePath(contentStoreType ContentStoreType) (string, error) {
 	case ContainerdContentStoreType:
 		return DefaultContainerdContentStorePath, nil
 	case SociContentStoreType:
-		return DefaultSociContentStorePath, nil
+		if root == "" {
+			return DefaultSociContentStorePath, nil
+		}
+		return filepath.Join(root, "content"), nil
 	}
 	return "", errors.New("unexpectedly reached end of GetContentStorePath")
 }
@@ -202,7 +213,11 @@ func NewContentStore(opts ...Option) (Store, error) {
 	case ContainerdContentStoreType:
 		return NewContainerdStore(storeConfig)
 	case SociContentStoreType:
-		return NewSociStore()
+		path, err := GetContentStorePath(SociContentStoreType, storeConfig.SnapshotterRoot)
+		if err != nil {
+			return nil, err
+		}
+		return NewSociStore(path)
 	}
 	return nil, errors.New("unexpectedly reached end of NewContentStore")
 }
@@ -216,8 +231,11 @@ type SociStore struct {
 var _ Store = (*SociStore)(nil)
 
 // NewSociStore creates a sociStore.
-func NewSociStore() (*SociStore, error) {
-	store, err := oci.New(DefaultSociContentStorePath)
+func NewSociStore(path string) (*SociStore, error) {
+	if path == "" {
+		path = DefaultSociContentStorePath
+	}
+	store, err := oci.New(path)
 	return &SociStore{store}, err
 }
 

soci/store/store_test.go

@@ -103,7 +103,7 @@ func TestStoreGetContentStorePath(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.input, func(t *testing.T) {
-			output, err := GetContentStorePath(ContentStoreType(tt.input))
+			output, err := GetContentStorePath(ContentStoreType(tt.input), "")
 			if err != nil {
 				if !tt.fail {
 					t.Fatalf("content store type \"%s\" produced path %s with unexpected error %v", tt.input, output, err)

util/testutil/store.go

@@ -40,7 +40,7 @@ import (
 
 // GetContentStoreBlobPath returns the bottom level directory for the content store, e.g. "/blobs/sha256".
 func GetContentStoreBlobPath(contentStoreType store.ContentStoreType) (string, error) {
-	contentStorePath, err := store.GetContentStorePath(contentStoreType)
+	contentStorePath, err := store.GetContentStorePath(contentStoreType, "")
 	if err != nil {
 		return "", err
 	}