TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2791 from nspcc-dev/fix-win-reest

Browse source 
cli: properly close storage on `db reset`
This commit is contained in:
Roman Khimov 2022-11-14 15:13:30 +07:00 committed by GitHub
commit 633413541c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cli/server/server.go
View file

@ -131,7 +131,7 @@ func newGraceContext() context.Context {
} }
func initBCWithMetrics(cfg config.Config, log *zap.Logger) (*core.Blockchain, *metrics.Service, *metrics.Service, error) { 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 { if err != nil {
return nil, nil, nil, cli.NewExitError(err, 1) return nil, nil, nil, cli.NewExitError(err, 1)
} }
@ -333,7 +333,7 @@ func resetDB(ctx *cli.Context) error {
if logCloser != nil { if logCloser != nil {
defer func() { _ = logCloser() }() defer func() { _ = logCloser() }()
} }
chain, err := initBlockChain(cfg, log) chain, store, err := initBlockChain(cfg, log)
if err != nil { if err != nil {
return cli.NewExitError(fmt.Errorf("failed to create Blockchain instance: %w", err), 1) 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 { if err != nil {
return cli.NewExitError(fmt.Errorf("failed to reset chain state to height %d: %w", h, err), 1) 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 return nil
} }
@ -616,17 +620,25 @@ func configureAddresses(cfg *config.ApplicationConfiguration) {
} }
// initBlockChain initializes BlockChain with preselected DB. // 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) store, err := storage.NewStore(cfg.ApplicationConfiguration.DBConfiguration)
if err != nil { 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) chain, err := core.NewBlockchain(store, cfg.ProtocolConfiguration, log)
if err != nil { 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 chain, nil
return nil, nil, cli.NewExitError(fmt.Errorf(errText, errArgs), 1)
}
return chain, store, nil
} }
// Logo returns Neo-Go logo. // Logo returns Neo-Go logo.

4
cli/server/server_test.go
View file

@ -336,12 +336,12 @@ func TestConfigureAddresses(t *testing.T) {
func TestInitBlockChain(t *testing.T) { func TestInitBlockChain(t *testing.T) {
t.Run("bad storage", func(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) require.Error(t, err)
}) })
t.Run("empty logger", func(t *testing.T) { t.Run("empty logger", func(t *testing.T) {
_, err := initBlockChain(config.Config{ _, _, err := initBlockChain(config.Config{
ApplicationConfiguration: config.ApplicationConfiguration{ ApplicationConfiguration: config.ApplicationConfiguration{
DBConfiguration: dbconfig.DBConfiguration{ DBConfiguration: dbconfig.DBConfiguration{
Type: dbconfig.InMemoryDB, Type: dbconfig.InMemoryDB,