fix8

GreptimeTeam · May 28, 2024 · 27c01d7 · 27c01d7
1 parent d417f13
commit 27c01d7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/pkg/cluster/baremetal/cluster.go b/pkg/cluster/baremetal/cluster.go
@@ -31,10 +31,10 @@ import (
 )
 
 type Cluster struct {
-	config       *config.BareMetalClusterConfig
-	createNoDirs bool
-	enableCache  bool
-	metastore    bool
+	config        *config.BareMetalClusterConfig
+	createNoDirs  bool
+	enableCache   bool
+	useMemoryMeta bool
 
 	am artifacts.Manager
 	mm metadata.Manager
@@ -55,9 +55,9 @@ type ClusterComponents struct {
 }
 
 func NewClusterComponents(config *config.BareMetalClusterComponentsConfig, workingDirs components.WorkingDirs,
-	wg *sync.WaitGroup, logger logger.Logger, metastore bool) *ClusterComponents {
+	wg *sync.WaitGroup, logger logger.Logger, useMemoryMeta bool) *ClusterComponents {
 	return &ClusterComponents{
-		MetaSrv:  components.NewMetaSrv(config.MetaSrv, workingDirs, wg, logger, metastore),
+		MetaSrv:  components.NewMetaSrv(config.MetaSrv, workingDirs, wg, logger, useMemoryMeta),
 		Datanode: components.NewDataNode(config.Datanode, config.MetaSrv.ServerAddr, workingDirs, wg, logger),
 		Frontend: components.NewFrontend(config.Frontend, config.MetaSrv.ServerAddr, workingDirs, wg, logger),
 		Etcd:     components.NewEtcd(workingDirs, wg, logger),
@@ -85,9 +85,9 @@ func WithEnableCache(enableCache bool) Option {
 	}
 }
 
-func WithMetastore(metastore bool) Option {
+func WithMetastore(useMemoryMeta bool) Option {
 	return func(c *Cluster) {
-		c.metastore = metastore
+		c.useMemoryMeta = useMemoryMeta
 	}
 }
 
@@ -143,7 +143,7 @@ func NewCluster(l logger.Logger, clusterName string, opts ...Option) (cluster.Op
 		DataDir: csd.DataDir,
 		LogsDir: csd.LogsDir,
 		PidsDir: csd.PidsDir,
-	}, &c.wg, c.logger, c.metastore)
+	}, &c.wg, c.logger, c.useMemoryMeta)
 
 	return c, nil
 }
diff --git a/pkg/cluster/baremetal/create.go b/pkg/cluster/baremetal/create.go
@@ -52,7 +52,7 @@ func (c *Cluster) Create(ctx context.Context, options *opt.CreateOptions) error
 		return nil
 	}
 
-	if c.metastore {
+	if c.useMemoryMeta {
 		if err := withSpinner("Etcd Cluster", c.createEtcdCluster); err != nil {
 			return err
 		}

diff --git a/pkg/components/metasrv.go b/pkg/components/metasrv.go
@@ -34,22 +34,22 @@ import (
 type metaSrv struct {
 	config *config.MetaSrv
 
-	workingDirs WorkingDirs
-	wg          *sync.WaitGroup
-	logger      logger.Logger
-	metastore   bool
+	workingDirs   WorkingDirs
+	wg            *sync.WaitGroup
+	logger        logger.Logger
+	useMemoryMeta bool
 
 	allocatedDirs
 }
 
 func NewMetaSrv(config *config.MetaSrv, workingDirs WorkingDirs,
-	wg *sync.WaitGroup, logger logger.Logger, metastore bool) ClusterComponent {
+	wg *sync.WaitGroup, logger logger.Logger, useMemoryMeta bool) ClusterComponent {
 	return &metaSrv{
-		config:      config,
-		workingDirs: workingDirs,
-		wg:          wg,
-		logger:      logger,
-		metastore:   metastore,
+		config:        config,
+		workingDirs:   workingDirs,
+		wg:            wg,
+		logger:        logger,
+		useMemoryMeta: useMemoryMeta,
 	}
 }
 
@@ -128,9 +128,9 @@ func (m *metaSrv) BuildArgs(params ...interface{}) []string {
 	args = GenerateAddrArg("--http-addr", m.config.HTTPAddr, nodeID, args)
 	args = GenerateAddrArg("--bind-addr", bindAddr, nodeID, args)
 
-	if m.metastore {
-		metastore := strconv.FormatBool(m.metastore)
-		args = GenerateAddrArg("--use-memory-store", metastore, nodeID, args)
+	if m.useMemoryMeta {
+		useMemoryMeta := strconv.FormatBool(m.useMemoryMeta)
+		args = GenerateAddrArg("--use-memory-store", useMemoryMeta, nodeID, args)
 	}
 
 	if len(m.config.Config) > 0 {