mirror of
https://github.com/nspcc-dev/neo-go.git
synced 2024-12-23 23:25:22 +00:00
Merge pull request #2791 from nspcc-dev/fix-win-reest
cli: properly close storage on `db reset`
This commit is contained in:
commit
633413541c
2 changed files with 20 additions and 8 deletions
|
@ -131,7 +131,7 @@ func newGraceContext() context.Context {
|
|||
}
|
||||
|
||||
func initBCWithMetrics(cfg config.Config, log *zap.Logger) (*core.Blockchain, *metrics.Service, *metrics.Service, error) {
|
||||
chain, err := initBlockChain(cfg, log)
|
||||
chain, _, err := initBlockChain(cfg, log)
|
||||
if err != nil {
|
||||
return nil, nil, nil, cli.NewExitError(err, 1)
|
||||
}
|
||||
|
@ -333,7 +333,7 @@ func resetDB(ctx *cli.Context) error {
|
|||
if logCloser != nil {
|
||||
defer func() { _ = logCloser() }()
|
||||
}
|
||||
chain, err := initBlockChain(cfg, log)
|
||||
chain, store, err := initBlockChain(cfg, log)
|
||||
if err != nil {
|
||||
return cli.NewExitError(fmt.Errorf("failed to create Blockchain instance: %w", err), 1)
|
||||
}
|
||||
|
@ -342,6 +342,10 @@ func resetDB(ctx *cli.Context) error {
|
|||
if err != nil {
|
||||
return cli.NewExitError(fmt.Errorf("failed to reset chain state to height %d: %w", h, err), 1)
|
||||
}
|
||||
err = store.Close()
|
||||
if err != nil {
|
||||
return cli.NewExitError(fmt.Errorf("failed to close the DB: %w", err), 1)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -616,17 +620,25 @@ func configureAddresses(cfg *config.ApplicationConfiguration) {
|
|||
}
|
||||
|
||||
// initBlockChain initializes BlockChain with preselected DB.
|
||||
func initBlockChain(cfg config.Config, log *zap.Logger) (*core.Blockchain, error) {
|
||||
func initBlockChain(cfg config.Config, log *zap.Logger) (*core.Blockchain, storage.Store, error) {
|
||||
store, err := storage.NewStore(cfg.ApplicationConfiguration.DBConfiguration)
|
||||
if err != nil {
|
||||
return nil, cli.NewExitError(fmt.Errorf("could not initialize storage: %w", err), 1)
|
||||
return nil, nil, cli.NewExitError(fmt.Errorf("could not initialize storage: %w", err), 1)
|
||||
}
|
||||
|
||||
chain, err := core.NewBlockchain(store, cfg.ProtocolConfiguration, log)
|
||||
if err != nil {
|
||||
return nil, cli.NewExitError(fmt.Errorf("could not initialize blockchain: %w", err), 1)
|
||||
errText := "could not initialize blockchain: %w"
|
||||
errArgs := []interface{}{err}
|
||||
closeErr := store.Close()
|
||||
if closeErr != nil {
|
||||
errText += "; failed to close the DB: %w"
|
||||
errArgs = append(errArgs, closeErr)
|
||||
}
|
||||
|
||||
return nil, nil, cli.NewExitError(fmt.Errorf(errText, errArgs), 1)
|
||||
}
|
||||
return chain, nil
|
||||
return chain, store, nil
|
||||
}
|
||||
|
||||
// Logo returns Neo-Go logo.
|
||||
|
|
|
@ -336,12 +336,12 @@ func TestConfigureAddresses(t *testing.T) {
|
|||
|
||||
func TestInitBlockChain(t *testing.T) {
|
||||
t.Run("bad storage", func(t *testing.T) {
|
||||
_, err := initBlockChain(config.Config{}, nil)
|
||||
_, _, err := initBlockChain(config.Config{}, nil)
|
||||
require.Error(t, err)
|
||||
})
|
||||
|
||||
t.Run("empty logger", func(t *testing.T) {
|
||||
_, err := initBlockChain(config.Config{
|
||||
_, _, err := initBlockChain(config.Config{
|
||||
ApplicationConfiguration: config.ApplicationConfiguration{
|
||||
DBConfiguration: dbconfig.DBConfiguration{
|
||||
Type: dbconfig.InMemoryDB,
|
||||
|
|
Loading…
Reference in a new issue