AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 13:58:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed deferring of closing dbs (#5982)

Browse Source 
* fixed deferring of closing dbs
* removed unnecessary slice pointer
* Merge branch 'master' into merge-defer-fix
* Merge branch 'master' into merge-defer-fix
This commit is contained in:
rkapka
2020-05-26 02:38:41 +02:00
committed by GitHub
parent 3b65cb6d0b
commit b3f005fe94
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
validator/accounts/account.go
View File

@@ -224,6 +224,13 @@ func HandleEmptyKeystoreFlags(cliCtx *cli.Context, confirmPassword bool) (string
// Merge merges data from validator databases in sourceDirectories into a new store, which is created in targetDirectory.
func Merge(ctx context.Context, sourceDirectories []string, targetDirectory string) error {
var sourceStores []*db.Store
defer func() {
for _, store := range sourceStores {
if err := store.Close(); err != nil {
err = errors.Wrapf(err, "Failed to close the database in %s", store.DatabasePath())
}
}
}()
for _, dir := range sourceDirectories {
store, err := db.GetKVStore(dir)
@@ -245,14 +252,6 @@ func Merge(ctx context.Context, sourceDirectories []string, targetDirectory stri
return errors.Wrapf(err, "Failed to merge validator databases into %s", targetDirectory)
}
defer func() {
for _, store := range sourceStores {
if err := store.Close(); err != nil {
err = errors.Wrapf(err, "Failed to close the database in %s", store.DatabasePath())
}
}
}()
return nil
}