582b164c46
* mod: bump btcwallet version to accept db timeout * btcwallet: add DBTimeOut in config * kvdb: add database timeout option for bbolt This commit adds a DBTimeout option in bbolt config. The relevant functions walletdb.Open/Create are updated to use this config. In addition, the bolt compacter also applies the new timeout option. * channeldb: add DBTimeout in db options This commit adds the DBTimeout option for channeldb. A new unit test file is created to test the default options. In addition, the params used in kvdb.Create inside channeldb_test is updated with a DefaultDBTimeout value. * contractcourt+routing: use DBTimeout in kvdb This commit touches multiple test files in contractcourt and routing. The call of function kvdb.Create and kvdb.Open are now updated with the new param DBTimeout, using the default value kvdb.DefaultDBTimeout. * lncfg: add DBTimeout option in db config The DBTimeout option is added to db config. A new unit test is added to check the default DB config is created as expected. * migration: add DBTimeout param in kvdb.Create/kvdb.Open * keychain: update tests to use DBTimeout param * htlcswitch+chainreg: add DBTimeout option * macaroons: support DBTimeout config in creation This commit adds the DBTimeout during the creation of macaroons.db. The usage of kvdb.Create and kvdb.Open in its tests are updated with a timeout value using kvdb.DefaultDBTimeout. * walletunlocker: add dbTimeout option in UnlockerService This commit adds a new param, dbTimeout, during the creation of UnlockerService. This param is then passed to wallet.NewLoader inside various service calls, specifying a timeout value to be used when opening the bbolt. In addition, the macaroonService is also called with this dbTimeout param. * watchtower/wtdb: add dbTimeout param during creation This commit adds the dbTimeout param for the creation of both watchtower.db and wtclient.db. * multi: add db timeout param for walletdb.Create This commit adds the db timeout param for the function call walletdb.Create. It touches only the test files found in chainntnfs, lnwallet, and routing. * lnd: pass DBTimeout config to relevant services This commit enables lnd to pass the DBTimeout config to the following services/config/functions, - chainControlConfig - walletunlocker - wallet.NewLoader - macaroons - watchtower In addition, the usage of wallet.Create is updated too. * sample-config: add dbtimeout option
116 lines
3.2 KiB
Go
116 lines
3.2 KiB
Go
package lncfg
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/lightningnetwork/lnd/channeldb/kvdb"
|
|
)
|
|
|
|
const (
|
|
dbName = "channel.db"
|
|
BoltBackend = "bolt"
|
|
EtcdBackend = "etcd"
|
|
DefaultBatchCommitInterval = 500 * time.Millisecond
|
|
)
|
|
|
|
// DB holds database configuration for LND.
|
|
type DB struct {
|
|
Backend string `long:"backend" description:"The selected database backend."`
|
|
|
|
BatchCommitInterval time.Duration `long:"batch-commit-interval" description:"The maximum duration the channel graph batch schedulers will wait before attempting to commit a batch of pending updates. This can be tradeoff database contenion for commit latency."`
|
|
|
|
Etcd *kvdb.EtcdConfig `group:"etcd" namespace:"etcd" description:"Etcd settings."`
|
|
|
|
Bolt *kvdb.BoltConfig `group:"bolt" namespace:"bolt" description:"Bolt settings."`
|
|
}
|
|
|
|
// NewDB creates and returns a new default DB config.
|
|
func DefaultDB() *DB {
|
|
return &DB{
|
|
Backend: BoltBackend,
|
|
BatchCommitInterval: DefaultBatchCommitInterval,
|
|
Bolt: &kvdb.BoltConfig{
|
|
AutoCompactMinAge: kvdb.DefaultBoltAutoCompactMinAge,
|
|
DBTimeout: kvdb.DefaultDBTimeout,
|
|
},
|
|
}
|
|
}
|
|
|
|
// Validate validates the DB config.
|
|
func (db *DB) Validate() error {
|
|
switch db.Backend {
|
|
case BoltBackend:
|
|
|
|
case EtcdBackend:
|
|
if !db.Etcd.Embedded && db.Etcd.Host == "" {
|
|
return fmt.Errorf("etcd host must be set")
|
|
}
|
|
|
|
default:
|
|
return fmt.Errorf("unknown backend, must be either \"%v\" or \"%v\"",
|
|
BoltBackend, EtcdBackend)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// DatabaseBackends is a two-tuple that holds the set of active database
|
|
// backends for the daemon. The two backends we expose are the local database
|
|
// backend, and the remote backend. The LocalDB attribute will always be
|
|
// populated. However, the remote DB will only be set if a replicated database
|
|
// is active.
|
|
type DatabaseBackends struct {
|
|
// LocalDB points to the local non-replicated backend.
|
|
LocalDB kvdb.Backend
|
|
|
|
// RemoteDB points to a possibly networked replicated backend. If no
|
|
// replicated backend is active, then this pointer will be nil.
|
|
RemoteDB kvdb.Backend
|
|
}
|
|
|
|
// GetBackends returns a set of kvdb.Backends as set in the DB config. The
|
|
// local database will ALWAYS be non-nil, while the remote database will only
|
|
// be populated if etcd is specified.
|
|
func (db *DB) GetBackends(ctx context.Context, dbPath string,
|
|
networkName string) (*DatabaseBackends, error) {
|
|
|
|
var (
|
|
localDB, remoteDB kvdb.Backend
|
|
err error
|
|
)
|
|
|
|
if db.Backend == EtcdBackend {
|
|
if db.Etcd.Embedded {
|
|
remoteDB, _, err = kvdb.GetEtcdTestBackend(dbPath, dbName)
|
|
} else {
|
|
// Prefix will separate key/values in the db.
|
|
remoteDB, err = kvdb.GetEtcdBackend(ctx, networkName, db.Etcd)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
localDB, err = kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
|
|
DBPath: dbPath,
|
|
DBFileName: dbName,
|
|
DBTimeout: db.Bolt.DBTimeout,
|
|
NoFreelistSync: !db.Bolt.SyncFreelist,
|
|
AutoCompact: db.Bolt.AutoCompact,
|
|
AutoCompactMinAge: db.Bolt.AutoCompactMinAge,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &DatabaseBackends{
|
|
LocalDB: localDB,
|
|
RemoteDB: remoteDB,
|
|
}, nil
|
|
}
|
|
|
|
// Compile-time constraint to ensure Workers implements the Validator interface.
|
|
var _ Validator = (*DB)(nil)
|