apply feedback

sourcenetwork · Aug 16, 2022 · d6bc357 · d6bc357
1 parent f9b1a47
commit d6bc357
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/cli/start.go b/cli/start.go
@@ -236,12 +236,12 @@ func init() {
 	}
 
 	startCmd.Flags().Var(
-		&cfg.Datastore.Badger.VLogMaxSize, "vlogmaxsize",
-		"Specify the datastore maximum value log file size (in bytes)",
+		&cfg.Datastore.Badger.ValueLogFileSize, "valuelogfilesize",
+		"Specify the datastore value log file size (in bytes). In memory size will be 2*valuelogfilesize",
 	)
-	err = viper.BindPFlag("datastore.badger.vlogmaxsize", startCmd.Flags().Lookup("vlogmaxsize"))
+	err = viper.BindPFlag("datastore.badger.valuelogfilesize", startCmd.Flags().Lookup("valuelogfilesize"))
 	if err != nil {
-		log.FeedbackFatalE(context.Background(), "Could not bind datastore..badger.vlogmaxsize", err)
+		log.FeedbackFatalE(context.Background(), "Could not bind datastore.badger.valuelogfilesize", err)
 	}
 
 	startCmd.Flags().String(

diff --git a/config/config.go b/config/config.go
@@ -97,12 +97,13 @@ func (cfg *Config) Load(rootDirPath string) error {
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
 
-	if err := viper.Unmarshal(cfg, viper.DecodeHook(mapstructure.TextUnmarshallerHookFunc())); err != nil {
+	err := viper.Unmarshal(cfg, viper.DecodeHook(mapstructure.TextUnmarshallerHookFunc()))
+	if err != nil {
 		return err
 	}
 	cfg.setBadgerVLogMaxSize()
 	cfg.handleParams(rootDirPath)
-	err := cfg.validate()
+	err = cfg.validate()
 	if err != nil {
 		return err
 	}
@@ -128,7 +129,8 @@ func (cfg *Config) LoadWithoutRootDir() error {
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
 
-	if err := viper.Unmarshal(cfg, viper.DecodeHook(mapstructure.TextUnmarshallerHookFunc())); err != nil {
+	err = viper.Unmarshal(cfg, viper.DecodeHook(mapstructure.TextUnmarshallerHookFunc()))
+	if err != nil {
 		return err
 	}
 	rootDir, err := DefaultRootDir()
@@ -178,7 +180,7 @@ func (cfg *Config) handleParams(rootDir string) {
 }
 
 func (cfg *Config) setBadgerVLogMaxSize() {
-	cfg.Datastore.Badger.ValueLogFileSize = int64(cfg.Datastore.Badger.VLogMaxSize)
+	cfg.Datastore.Badger.Options.ValueLogFileSize = int64(cfg.Datastore.Badger.ValueLogFileSize)
 }
 
 // DatastoreConfig configures datastores.
@@ -190,8 +192,8 @@ type DatastoreConfig struct {
 
 // BadgerConfig configures Badger's on-disk / filesystem mode.
 type BadgerConfig struct {
-	Path        string
-	VLogMaxSize ByteSize
+	Path             string
+	ValueLogFileSize ByteSize
 	*badgerds.Options
 }
 
@@ -278,9 +280,9 @@ func defaultDatastoreConfig() *DatastoreConfig {
 	return &DatastoreConfig{
 		Store: "badger",
 		Badger: BadgerConfig{
-			Path:        "data",
-			VLogMaxSize: 1 * GB,
-			Options:     &opts,
+			Path:             "data",
+			ValueLogFileSize: 1 * GB,
+			Options:          &opts,
 		},
 	}
 }

diff --git a/config/configfile.go b/config/configfile.go
@@ -54,9 +54,9 @@ datastore:
   store: {{ .Datastore.Store }}
   badger:
     path: {{ .Datastore.Badger.Path }}
-    # Maximum file size of the value log file. The actual file size will be 2*vlogmaxsize.
+    # Maximum file size of the value log files. The in memory file size will be 2*valuelogfilesize.
     # Human friendly units can be used (ex: 500MB).
-    vlogmaxsize: {{ .Datastore.Badger.VLogMaxSize }}
+    valuelogfilesize: {{ .Datastore.Badger.ValueLogFileSize }}
   # memory:
   #    size: {{ .Datastore.Memory.Size }}
 

diff --git a/config/configfile_test.go b/config/configfile_test.go
@@ -109,7 +109,7 @@ func TestReadConfigFileForDatastore(t *testing.T) {
 	cfg := DefaultConfig()
 	cfg.Datastore.Store = "badger"
 	cfg.Datastore.Badger.Path = "dataPath"
-	cfg.Datastore.Badger.VLogMaxSize = 512 * MB
+	cfg.Datastore.Badger.ValueLogFileSize = 512 * MB
 
 	err := cfg.WriteConfigFileToRootDir(dir)
 	if err != nil {
@@ -131,5 +131,5 @@ func TestReadConfigFileForDatastore(t *testing.T) {
 	}
 	assert.Equal(t, cfg.Datastore.Store, cfgFromFile.Datastore.Store)
 	assert.Equal(t, dir+"/"+cfg.Datastore.Badger.Path, cfgFromFile.Datastore.Badger.Path)
-	assert.NotEqual(t, cfg.Datastore.Badger.VLogMaxSize, cfgFromFile.Datastore.Badger.VLogMaxSize)
+	assert.NotEqual(t, cfg.Datastore.Badger.ValueLogFileSize, cfgFromFile.Datastore.Badger.ValueLogFileSize)
 }