Skip to content

Commit b9ef9fc

Browse files
committed
raftengine: fix atomic replace cleanup
1 parent 2c290db commit b9ef9fc

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

internal/raftengine/etcd/persistence.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,19 +428,13 @@ func replaceFile(path string, write func(io.Writer) error) (err error) {
428428
tmpPath := file.Name()
429429
closed := false
430430
defer func() {
431-
defer func() {
432431
if !closed {
433-
_ = file.Close()
432+
err = errors.CombineErrors(err, errors.WithStack(file.Close()))
434433
}
435434
if err != nil {
436435
_ = os.Remove(tmpPath)
437436
}
438437
}()
439-
if err != nil {
440-
_ = os.Remove(tmpPath)
441-
}
442-
err = errors.CombineErrors(err, errors.WithStack(closeErr))
443-
}()
444438

445439
if err := write(file); err != nil {
446440
return err

0 commit comments

Comments
 (0)