taigrr/bitcask
1
0
Fork 0
mirror of https://github.com/taigrr/bitcask synced 2025-01-18 04:03:17 -08:00
Code Issues Projects Releases Wiki Activity

Fix recoverDatafile error covering (#162)

Browse Source
This commit is contained in:
chenbc 2020-06-17 13:06:30 +08:00 committed by GitHub
parent 1ef3cde964
commit afdf956e7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/data/recover.go
View File

@ -43,7 +43,10 @@ func recoverDatafile(path string, cfg *config.Config) (recovered bool, err error
return false, fmt.Errorf("opening the datafile: %s", err) return false, fmt.Errorf("opening the datafile: %s", err)
} }
defer func() { defer func() {
err = f.Close() closeErr := f.Close()
if err == nil {
err = closeErr
}
}() }()
_, file := filepath.Split(path) _, file := filepath.Split(path)
rPath := fmt.Sprintf("%s.recovered", file) rPath := fmt.Sprintf("%s.recovered", file)
@ -52,7 +55,10 @@ func recoverDatafile(path string, cfg *config.Config) (recovered bool, err error
return false, fmt.Errorf("creating the recovered datafile: %w", err) return false, fmt.Errorf("creating the recovered datafile: %w", err)
} }
defer func() { defer func() {
err = fr.Close() closeErr := fr.Close()
if err == nil {
err = closeErr
}
}() }()
dec := codec.NewDecoder(f, cfg.MaxKeySize, cfg.MaxValueSize) dec := codec.NewDecoder(f, cfg.MaxKeySize, cfg.MaxValueSize)