Merge branch 'dev' into health_checks_cached_entries

Author: StephenButtolph

database/leveldb/db.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/utils"
+	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
 const (
@@ -36,6 +37,7 @@ const (
 // in binary-alphabetical order.
 type Database struct {
 	*leveldb.DB
+	log logging.Logger
 
 	// True if there was previously an error other than "not found" or "closed"
 	// while performing a db operation. If [errored] == true, Has, Get, Put,
@@ -45,7 +47,7 @@ type Database struct {
 }
 
 // New returns a wrapped LevelDB object.
-func New(file string, blockCacheSize, writeBufferSize, handleCap int) (*Database, error) {
+func New(file string, log logging.Logger, blockCacheSize, writeBufferSize, handleCap int) (*Database, error) {
 	// Enforce minimums
 	if blockCacheSize < minBlockCacheSize {
 		blockCacheSize = minBlockCacheSize
@@ -71,7 +73,10 @@ func New(file string, blockCacheSize, writeBufferSize, handleCap int) (*Database
 	if err != nil {
 		return nil, err
 	}
-	return &Database{DB: db}, nil
+	return &Database{
+		DB:  db,
+		log: log,
+	}, nil
 }
 
 // Has returns if the key is set in the database
@@ -169,6 +174,7 @@ func (db *Database) handleError(err error) error {
 	// If we get an error other than "not found" or "closed", disallow future
 	// database operations to avoid possible corruption
 	if err != nil && err != database.ErrNotFound && err != database.ErrClosed {
+		db.log.Fatal("leveldb error: %w", err)
 		db.errored = true
 	}
 	return err

database/leveldb/db_test.go

@@ -9,13 +9,14 @@ import (
 	"testing"
 
 	"github.com/ava-labs/avalanchego/database"
+	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
 func TestInterface(t *testing.T) {
 	for i, test := range database.Tests {
 		folder := fmt.Sprintf("db%d", i)
 
-		db, err := New(folder, 0, 0, 0)
+		db, err := New(folder, logging.NoLog{}, 0, 0, 0)
 		if err != nil {
 			t.Fatalf("leveldb.New(%s, 0, 0) errored with %s", folder, err)
 		}

main/keys.go

@@ -22,7 +22,7 @@ const (
 	assertionsEnabledKey                    = "assertions-enabled"
 	signatureVerificationEnabledKey         = "signature-verification-enabled"
 	dbEnabledKey                            = "db-enabled"
-	dbDirKey                                = "db-dir"
+	dbPathKey                               = "db-dir"
 	publicIPKey                             = "public-ip"
 	dynamicUpdateDurationKey                = "dynamic-update-duration"
 	dynamicPublicIPResolverKey              = "dynamic-public-ip"

main/main.go

@@ -6,6 +6,9 @@ package main
 import (
 	"fmt"
 
+	"github.com/ava-labs/avalanchego/database"
+	"github.com/ava-labs/avalanchego/database/leveldb"
+	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/nat"
 	"github.com/ava-labs/avalanchego/node"
 	"github.com/ava-labs/avalanchego/utils"
@@ -48,14 +51,25 @@ func main() {
 	}
 	fmt.Println(header)
 
+	var db database.Database
+	if Config.DBEnabled {
+		db, err = leveldb.New(Config.DBPath, log, 0, 0, 0)
+		if err != nil {
+			log.Error("couldn't open database at %s: %s", Config.DBPath, err)
+			return
+		}
+	} else {
+		db = memdb.New()
+	}
+
 	defer func() {
 		if r := recover(); r != nil {
 			fmt.Println("Recovered panic from", r)
 		}
 	}()
 
 	defer func() {
-		if err := Config.DB.Close(); err != nil {
+		if err := db.Close(); err != nil {
 			log.Warn("failed to close the node's DB: %s", err)
 		}
 		log.StopOnPanic()
@@ -134,7 +148,7 @@ func main() {
 	log.Info("this node's IP is set to: %s", Config.StakingIP.IP())
 
 	for {
-		shouldRestart, err := run(log, logFactory)
+		shouldRestart, err := run(db, log, logFactory)
 		if err != nil {
 			break
 		}
@@ -148,14 +162,14 @@ func main() {
 
 // Initialize and run the node.
 // Returns true if the node should restart after this function returns.
-func run(log logging.Logger, logFactory logging.Factory) (bool, error) {
+func run(db database.Database, log logging.Logger, logFactory logging.Factory) (bool, error) {
 	log.Info("initializing node")
 	node := node.Node{}
 	restarter := &restarter{
 		node:          &node,
 		shouldRestart: &utils.AtomicBool{},
 	}
-	if err := node.Initialize(&Config, log, logFactory, restarter); err != nil {
+	if err := node.Initialize(&Config, db, log, logFactory, restarter); err != nil {
 		log.Error("error initializing node: %s", err)
 		return restarter.shouldRestart.GetValue(), err
 	}

main/params.go

@@ -20,8 +20,6 @@ import (
 
 	"github.com/kardianos/osext"
 
-	"github.com/ava-labs/avalanchego/database/leveldb"
-	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/ipcs"
@@ -94,9 +92,12 @@ func avalancheFlagSet() *flag.FlagSet {
 	fs.String(pluginDirKey, defaultString, "Plugin directory for Avalanche VMs")
 	// Network ID
 	fs.String(networkNameKey, defaultNetworkName, "Network ID this node will connect to")
+	// AVAX fees
+	fs.Uint64(txFeeKey, units.MilliAvax, "Transaction fee, in nAVAX")
+	fs.Uint64(creationTxFeeKey, units.MilliAvax, "Transaction fee, in nAVAX, for transactions that create new state")
 	// Database
 	fs.Bool(dbEnabledKey, true, "Turn on persistent storage")
-	fs.String(dbDirKey, defaultString, "Database directory for Avalanche state")
+	fs.String(dbPathKey, defaultDbDir, "Path to database directory")
 	// Coreth Config
 	fs.String(corethConfigKey, defaultString, "Specifies config to pass into coreth")
 	// Logging
@@ -108,9 +109,6 @@ func avalancheFlagSet() *flag.FlagSet {
 	fs.Bool(assertionsEnabledKey, true, "Turn on assertion execution")
 	// Signature Verification
 	fs.Bool(signatureVerificationEnabledKey, true, "Turn on signature verification")
-	// Fees
-	fs.Uint64(txFeeKey, units.MilliAvax, "Transaction fee, in nAVAX")
-	fs.Uint64(creationTxFeeKey, units.MilliAvax, "Transaction fee, in nAVAX, for transactions that create new state")
 
 	// Networking
 	// Public IP Resolution
@@ -179,7 +177,7 @@ func avalancheFlagSet() *flag.FlagSet {
 	fs.Duration(healthCheckAveragerHalflifeKey, 10*time.Second, "Halflife of averager when calculating a running average in a health check")
 	// Network Layer Health
 	fs.Duration(networkHealthMaxTimeSinceMsgSentKey, time.Minute, "Network layer returns unhealthy if haven't received a message for at least this much time")
-	fs.Duration(networkHealthMaxTimeSinceMsgReceivedKey, time.Minute, "Netowork layer returns unhealthy if haven't received a message for at least this much time")
+	fs.Duration(networkHealthMaxTimeSinceMsgReceivedKey, time.Minute, "Network layer returns unhealthy if haven't received a message for at least this much time")
 	fs.Float64(networkHealthMaxPortionSendQueueFillKey, 0.9, "Network layer returns unhealthy if more than this portion of the pending send queue is full")
 	fs.Uint(networkHealthMinPeersKey, 1, "Network layer returns unhealthy if connected to less than this many peers")
 	fs.Float64(networkHealthMaxSendFailRateKey, .25, "Network layer reports unhealthy if more than this portion of attempted message sends fail")
@@ -317,21 +315,10 @@ func setNodeConfig(v *viper.Viper) error {
 	Config.NetworkID = networkID
 
 	// DB:
-	if v.GetBool(dbEnabledKey) {
-		dbDir := v.GetString(dbDirKey)
-		if dbDir == defaultString {
-			dbDir = defaultDbDir
-		}
-		dbDir = os.ExpandEnv(dbDir) // parse any env variables
-		dbPath := path.Join(dbDir, constants.NetworkName(Config.NetworkID), dbVersion)
-		db, err := leveldb.New(dbPath, 0, 0, 0)
-		if err != nil {
-			return fmt.Errorf("couldn't create db at %s: %w", dbPath, err)
-		}
-		Config.DB = db
-	} else {
-		Config.DB = memdb.New()
-	}
+	Config.DBEnabled = v.GetBool(dbEnabledKey)
+	Config.DBPath = v.GetString(dbPathKey)
+	Config.DBPath = os.ExpandEnv(Config.DBPath) // parse any env variables
+	Config.DBPath = path.Join(Config.DBPath, constants.NetworkName(Config.NetworkID), dbVersion)
 
 	// IP Configuration
 	// Resolves our public IP, or does nothing

node/config.go

@@ -6,7 +6,6 @@ package node
 import (
 	"time"
 
-	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/nat"
@@ -43,8 +42,11 @@ type Config struct {
 	// Crypto configuration
 	EnableCrypto bool
 
-	// Database to use for the node
-	DB database.Database
+	// Path to database
+	DBPath string
+
+	// If false, uses an in memory database
+	DBEnabled bool
 
 	// Staking configuration
 	StakingIP             utils.DynamicIPDesc

node/node.go

@@ -377,8 +377,8 @@ func (n *Node) Dispatch() error {
  ******************************************************************************
  */
 
-func (n *Node) initDatabase() error {
-	n.DB = n.Config.DB
+func (n *Node) initDatabase(db database.Database) error {
+	n.DB = db
 
 	rawExpectedGenesisHash := hashing.ComputeHash256(n.Config.GenesisBytes)
 
@@ -824,6 +824,7 @@ func (n *Node) initAliases(genesisBytes []byte) error {
 // Initialize this node
 func (n *Node) Initialize(
 	config *Config,
+	db database.Database,
 	logger logging.Logger,
 	logFactory logging.Factory,
 	restarter utils.Restarter,
@@ -841,7 +842,7 @@ func (n *Node) Initialize(
 	}
 	n.HTTPLog = httpLog
 
-	if err := n.initDatabase(); err != nil { // Set up the node's database
+	if err := n.initDatabase(db); err != nil { // Set up the node's database
 		return fmt.Errorf("problem initializing database: %w", err)
 	}
 	if err = n.initNodeID(); err != nil { // Derive this node's ID

snow/engine/common/queue/jobs.go

@@ -124,7 +124,7 @@ func (j *Jobs) Execute(job Job) error {
 		}
 	}
 
-	return nil
+	return j.state.DeleteJob(j.db, jobID)
 }
 
 // Commit ...