mo-service: fix default cache configs (#18690)

fileservice: do not set default memory and disk config in setDefaults

Approved by: @zhangxu19830126, @sukki37

cmd/mo-service/config.go

@@ -583,6 +583,7 @@ func dumpCommonConfig(cfg Config) (map[string]*logservicepb.ConfigItem, error) {
 }
 
 func (c *Config) setFileserviceDefaultValues() {
+
 	for i := 0; i < len(c.FileServices); i++ {
 		config := &c.FileServices[i]
 
@@ -605,12 +606,6 @@ func (c *Config) setFileserviceDefaultValues() {
 			}
 		}
 
-		// set default disk cache dir
-		if config.Cache.DiskPath == nil {
-			path := config.DataDir + "-cache"
-			config.Cache.DiskPath = &path
-		}
-
 	}
 
 	// default LOCAL fs
@@ -664,4 +659,41 @@ func (c *Config) setFileserviceDefaultValues() {
 		})
 	}
 
+	for i := 0; i < len(c.FileServices); i++ {
+		config := &c.FileServices[i]
+
+		// cache configs
+		switch config.Name {
+
+		case defines.LocalFileServiceName:
+			// memory
+			if config.Cache.MemoryCapacity == nil {
+				capacity := tomlutil.ByteSize(512 * (1 << 20))
+				config.Cache.MemoryCapacity = &capacity
+			}
+			// no disk
+
+		case defines.SharedFileServiceName:
+			// memory
+			if config.Cache.MemoryCapacity == nil {
+				capacity := tomlutil.ByteSize(512 * (1 << 20))
+				config.Cache.MemoryCapacity = &capacity
+			}
+			// disk
+			if config.Cache.DiskPath == nil {
+				path := config.DataDir + "-cache"
+				config.Cache.DiskPath = &path
+			}
+			if config.Cache.DiskCapacity == nil {
+				capacity := tomlutil.ByteSize(8 * (1 << 30))
+				config.Cache.DiskCapacity = &capacity
+			}
+
+		case defines.ETLFileServiceName:
+			// no caches
+
+		}
+
+	}
+
 }

pkg/fileservice/cache.go

@@ -60,23 +60,6 @@ type CacheCallbacks struct {
 type CacheCallbackFunc = func(fscache.CacheKey, fscache.Data)
 
 func (c *CacheConfig) setDefaults() {
-	if c.MemoryCapacity == nil {
-		size := toml.ByteSize(512 << 20)
-		c.MemoryCapacity = &size
-	}
-	if c.DiskCapacity == nil {
-		size := toml.ByteSize(8 << 30)
-		c.DiskCapacity = &size
-	}
-	if c.DiskMinEvictInterval == nil {
-		c.DiskMinEvictInterval = &toml.Duration{
-			Duration: time.Minute * 7,
-		}
-	}
-	if c.DiskEvictTarget == nil {
-		target := 0.8
-		c.DiskEvictTarget = &target
-	}
 	c.RPC.Adjust()
 }
 

pkg/fileservice/local_fs.go

@@ -121,6 +121,7 @@ func (l *LocalFS) AllocateCacheData(size int) fscache.Data {
 func (l *LocalFS) initCaches(ctx context.Context, config CacheConfig) error {
 	config.setDefaults()
 
+	// remote
 	if config.RemoteCacheEnabled {
 		if config.QueryClient == nil {
 			return moerr.NewInternalError(ctx, "query client is nil")
@@ -131,7 +132,9 @@ func (l *LocalFS) initCaches(ctx context.Context, config CacheConfig) error {
 		)
 	}
 
-	if *config.MemoryCapacity > DisableCacheCapacity { // 1 means disable
+	// memory
+	if config.MemoryCapacity != nil &&
+		*config.MemoryCapacity > DisableCacheCapacity { // 1 means disable
 		l.memCache = NewMemCache(
 			fscache.ConstCapacity(int64(*config.MemoryCapacity)),
 			&config.CacheCallbacks,
@@ -144,26 +147,28 @@ func (l *LocalFS) initCaches(ctx context.Context, config CacheConfig) error {
 		)
 	}
 
-	if config.enableDiskCacheForLocalFS {
-		if *config.DiskCapacity > DisableCacheCapacity && config.DiskPath != nil {
-			var err error
-			l.diskCache, err = NewDiskCache(
-				ctx,
-				*config.DiskPath,
-				fscache.ConstCapacity(int64(*config.DiskCapacity)),
-				l.perfCounterSets,
-				true,
-				l.name,
-				l,
-			)
-			if err != nil {
-				return err
-			}
-			logutil.Info("fileservice: disk cache initialized",
-				zap.Any("fs-name", l.name),
-				zap.Any("config", config),
-			)
+	// disk
+	if config.enableDiskCacheForLocalFS &&
+		config.DiskCapacity != nil &&
+		*config.DiskCapacity > DisableCacheCapacity &&
+		config.DiskPath != nil {
+		var err error
+		l.diskCache, err = NewDiskCache(
+			ctx,
+			*config.DiskPath,
+			fscache.ConstCapacity(int64(*config.DiskCapacity)),
+			l.perfCounterSets,
+			true,
+			l.name,
+			l,
+		)
+		if err != nil {
+			return err
 		}
+		logutil.Info("fileservice: disk cache initialized",
+			zap.Any("fs-name", l.name),
+			zap.Any("config", config),
+		)
 	}
 
 	return nil

pkg/fileservice/remote_cache_test.go

@@ -29,6 +29,7 @@ import (
 	"github.com/matrixorigin/matrixone/pkg/pb/query"
 	"github.com/matrixorigin/matrixone/pkg/queryservice"
 	"github.com/matrixorigin/matrixone/pkg/queryservice/client"
+	"github.com/matrixorigin/matrixone/pkg/util/toml"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -121,7 +122,8 @@ func runTestWithTwoFileServices(t *testing.T, fn func(sf1 *cacheFs, sf2 *cacheFs
 			KeyRouterFactory: func() client.KeyRouter[query.CacheKey] {
 				return keyRouter
 			},
-			QueryClient: qt,
+			QueryClient:    qt,
+			MemoryCapacity: ptrTo[toml.ByteSize](1 << 30),
 		}
 		cacheCfg.setDefaults()
 		cacheCfg.SetRemoteCacheCallback()

pkg/fileservice/s3_fs.go

@@ -150,7 +150,8 @@ func (s *S3FS) initCaches(ctx context.Context, config CacheConfig) error {
 	}
 
 	// memory cache
-	if *config.MemoryCapacity > DisableCacheCapacity {
+	if config.MemoryCapacity != nil &&
+		*config.MemoryCapacity > DisableCacheCapacity {
 		s.memCache = NewMemCache(
 			fscache.ConstCapacity(int64(*config.MemoryCapacity)),
 			&config.CacheCallbacks,
@@ -164,7 +165,9 @@ func (s *S3FS) initCaches(ctx context.Context, config CacheConfig) error {
 	}
 
 	// disk cache
-	if *config.DiskCapacity > DisableCacheCapacity && config.DiskPath != nil {
+	if config.DiskCapacity != nil &&
+		*config.DiskCapacity > DisableCacheCapacity &&
+		config.DiskPath != nil {
 		var err error
 		s.diskCache, err = NewDiskCache(
 			ctx,

pkg/fileservice/s3_fs_test.go

@@ -968,7 +968,8 @@ func TestS3PrefetchFile(t *testing.T) {
 			RoleARN:   config.RoleARN,
 		},
 		CacheConfig{
-			DiskPath: ptrTo(cacheDir),
+			DiskCapacity: ptrTo[toml.ByteSize](1 << 30),
+			DiskPath:     ptrTo(cacheDir),
 		},
 		nil,
 		false,