triedb/pathdb: migrate BSC journal for JournalFileType

Author: yysung1123

core/blockchain.go

@@ -171,6 +171,8 @@ type CacheConfig struct {
 	TriesInMemory       uint64        // Number of recent tries to keep in memory
 	StateHistory        uint64        // Number of blocks from head whose state histories are reserved.
 	StateScheme         string        // Scheme used to store ethereum states and merkle tree nodes on top
+	JournalFilePath     string
+	JournalFile         bool
 
 	SnapshotNoBuild bool // Whether the background generation is allowed
 	SnapshotWait    bool // Wait for snapshot construction on startup. TODO(karalabe): This is a dirty hack for testing, nuke it
@@ -197,6 +199,8 @@ func (c *CacheConfig) triedbConfig(isVerkle bool) *triedb.Config {
 			StateHistory:    c.StateHistory,
 			CleanCacheSize:  c.TrieCleanLimit * 1024 * 1024,
 			WriteBufferSize: c.TrieDirtyLimit * 1024 * 1024,
+			JournalFilePath: c.JournalFilePath,
+			JournalFile:     c.JournalFile,
 		}
 	}
 	return config

eth/backend.go

@@ -71,6 +71,11 @@ import (
 	gethversion "github.com/ethereum/go-ethereum/version"
 )
 
+const (
+	JournalFileName = "trie.journal"
+	ChainData       = "chaindata"
+)
+
 var (
 	MilestoneWhitelistedDelayTimer = metrics.NewRegisteredTimer("chain/milestone/whitelisteddelay", nil)
 )
@@ -228,6 +233,12 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 			rawdb.WriteDatabaseVersion(chainDb, core.BlockChainVersion)
 		}
 	}
+	var (
+		journalFilePath string
+		path            string
+	)
+	path = ChainData
+	journalFilePath = stack.ResolvePath(path) + "/" + JournalFileName
 	var (
 		vmConfig = vm.Config{
 			EnablePreimageRecording: config.EnablePreimageRecording,
@@ -244,6 +255,8 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 			StateScheme:         scheme,
 			TriesInMemory:       config.TriesInMemory,
 			ChainHistoryMode:    config.HistoryMode,
+			JournalFilePath:     journalFilePath,
+			JournalFile:         config.JournalFileEnabled,
 		}
 	)
 

eth/ethconfig/config.go

@@ -116,7 +116,8 @@ type Config struct {
 	// State scheme represents the scheme used to store ethereum states and trie
 	// nodes on top. It can be 'hash', 'path', or none which means use the scheme
 	// consistent with persistent state.
-	StateScheme string `toml:",omitempty"`
+	StateScheme        string `toml:",omitempty"`
+	JournalFileEnabled bool   // Whether the TrieJournal is stored using journal file
 
 	// RequiredBlocks is a set of block number -> hash mappings which must be in the
 	// canonical chain of all remote peers. Setting the option makes geth verify the

eth/ethconfig/gen_config.go

@@ -8,12 +8,11 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	godebug "runtime/debug"
 	"strconv"
 	"strings"
 	"time"
 
-	godebug "runtime/debug"
-
 	"github.com/hashicorp/hcl/v2/hclsimple"
 	"github.com/imdario/mergo"
 	"github.com/mitchellh/go-homedir"
@@ -88,6 +87,8 @@ type Config struct {
 	// state.scheme selects the Scheme to use for storing ethereum state ('hash' or 'path')
 	StateScheme string `hcl:"state.scheme,optional" toml:"state.scheme,optional"`
 
+	JournalFileEnabled bool // Whether the TrieJournal is stored using journal file
+
 	// Snapshot enables the snapshot database mode
 	Snapshot bool `hcl:"snapshot,optional" toml:"snapshot,optional"`
 
@@ -1257,6 +1258,8 @@ func (c *Config) buildEth(stack *node.Node, accountManager *accounts.Manager) (*
 
 	n.EnableBlockTracking = c.Logging.EnableBlockTracking
 
+	n.JournalFileEnabled = c.JournalFileEnabled
+
 	return &n, nil
 }
 

internal/cli/server/config.go

@@ -104,6 +104,12 @@ func (c *Command) Flags(config *Config) *flagset.Flagset {
 		Value:   &c.cliConfig.StateScheme,
 		Default: c.cliConfig.StateScheme,
 	})
+	f.BoolFlag(&flagset.BoolFlag{
+		Name:    "journalfile",
+		Usage:   "Enable using journal file to store the TrieJournal instead of KVDB in pbss (default = false)",
+		Value:   &c.cliConfig.JournalFileEnabled,
+		Default: c.cliConfig.JournalFileEnabled,
+	})
 	f.MapStringFlag(&flagset.MapStringFlag{
 		Name:    "eth.requiredblocks",
 		Usage:   "Comma separated block number-to-hash mappings to require for peering (<number>=<hash>)",