Merge pull request #7141 from onflow/leo/update-pebble-dir-path

Update pebble dir path

Author: zhangchiqing

cmd/scaffold.go

@@ -171,7 +171,7 @@ func (fnb *FlowNodeBuilder) BaseFlags() {
 	fnb.flags.StringVar(&fnb.BaseConfig.BindAddr, "bind", defaultConfig.BindAddr, "address to bind on")
 	fnb.flags.StringVarP(&fnb.BaseConfig.BootstrapDir, "bootstrapdir", "b", defaultConfig.BootstrapDir, "path to the bootstrap directory")
 	fnb.flags.StringVarP(&fnb.BaseConfig.datadir, "datadir", "d", defaultConfig.datadir, "directory to store the public database (protocol state)")
-	fnb.flags.StringVar(&fnb.BaseConfig.pebbleDir, "pebbledir", defaultConfig.pebbleDir, "directory to store the public pebble database (protocol state)")
+	fnb.flags.StringVar(&fnb.BaseConfig.pebbleDir, "pebble-dir", defaultConfig.pebbleDir, "directory to store the public pebble database (protocol state)")
 	fnb.flags.StringVar(&fnb.BaseConfig.secretsdir, "secretsdir", defaultConfig.secretsdir, "directory to store private database (secrets)")
 	fnb.flags.StringVar(&fnb.BaseConfig.dbops, "dbops", defaultConfig.dbops, "database operations to use (badger-transaction, batch-update, pebble-update)")
 	fnb.flags.StringVarP(&fnb.BaseConfig.level, "loglevel", "l", defaultConfig.level, "level for logging output")

cmd/scaffold/pebble_db.go

@@ -17,7 +17,7 @@ func InitPebbleDB(logger zerolog.Logger, dir string) (*pebble.DB, io.Closer, err
 	// since we've set an default directory for the pebble DB, this check
 	// is not necessary, but rather a sanity check
 	if dir == "not set" {
-		return nil, nil, fmt.Errorf("missing required flag '--pebbledir'")
+		return nil, nil, fmt.Errorf("missing required flag '--pebble-dir'")
 	}
 
 	// Pre-create DB path

cmd/util/cmd/read-badger/cmd/root.go

@@ -31,7 +31,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&flagDatadir, "datadir", "d", "/var/flow/data/protocol", "directory to the badger dababase")
 	_ = rootCmd.MarkPersistentFlagRequired("data-dir")
 
-	rootCmd.PersistentFlags().StringVar(&flagPebbleDir, "pebbledir", "/var/flow/data/protocol-pebble", "directory to the pebble dababase")
+	rootCmd.PersistentFlags().StringVar(&flagPebbleDir, "pebble-dir", "/var/flow/data/protocol-pebble", "directory to the pebble dababase")
 
 	cobra.OnInitialize(initConfig)
 }

cmd/util/cmd/read-badger/cmd/storages.go

@@ -22,11 +22,11 @@ func InitStorages() (*storage.All, *badger.DB) {
 }
 
 // WithStorage runs the given function with the storage dependending on the flags
-// only one flag (datadir / pebbledir) is allowed to be set
+// only one flag (datadir / pebble-dir) is allowed to be set
 func WithStorage(f func(storage.DB) error) error {
 	if flagPebbleDir != "" {
 		if flagDatadir != "" {
-			log.Warn().Msg("both --datadir and --pebbledir are set, using --pebbledir")
+			log.Warn().Msg("both --datadir and --pebble-dir are set, using --pebble-dir")
 		}
 
 		db, err := pebblestorage.MustOpenDefaultPebbleDB(log.Logger, flagPebbleDir)
@@ -44,7 +44,7 @@ func WithStorage(f func(storage.DB) error) error {
 		return f(badgerimpl.ToDB(db))
 	}
 
-	return fmt.Errorf("must specify either --datadir or --pebbledir")
+	return fmt.Errorf("must specify either --datadir or --pebble-dir")
 }
 
 // InitBadgerAndPebble initializes the badger and pebble storages
@@ -54,7 +54,7 @@ func InitBadgerAndPebble() (bdb *badger.DB, pdb *pebble.DB, err error) {
 	}
 
 	if flagPebbleDir == "" {
-		return nil, nil, fmt.Errorf("must specify --pebbledir")
+		return nil, nil, fmt.Errorf("must specify --pebble-dir")
 	}
 
 	pdb, err = pebblestorage.MustOpenDefaultPebbleDB(