Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11821 from tedyu/wal-close-all

Browse Source 
closeAll should attempt to close all ReadCloser's
This commit is contained in:
Gyuho Lee 2020-04-28 20:54:13 -07:00 committed by GitHub
commit 3b79ed8506
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wal/wal.go
View File

@ -22,6 +22,7 @@ import (
"io"
"os"
"path/filepath"
"strings"
"sync"
"time"
@ -372,7 +373,7 @@ func openWALFiles(lg *zap.Logger, dirpath string, names []string, nameIndex int,
if write {
l, err := fileutil.TryLockFile(p, os.O_RDWR, fileutil.PrivateFileMode)
if err != nil {
closeAll(rcs...)
closeAll(lg, rcs...)
return nil, nil, nil, err
}
ls = append(ls, l)
@ -380,7 +381,7 @@ func openWALFiles(lg *zap.Logger, dirpath string, names []string, nameIndex int,
} else {
rf, err := os.OpenFile(p, os.O_RDONLY, fileutil.PrivateFileMode)
if err != nil {
closeAll(rcs...)
closeAll(lg, rcs...)
return nil, nil, nil, err
}
ls = append(ls, nil)
@ -389,7 +390,7 @@ func openWALFiles(lg *zap.Logger, dirpath string, names []string, nameIndex int,
rs = append(rs, rcs[len(rcs)-1])
}
closer := func() error { return closeAll(rcs...) }
closer := func() error { return closeAll(lg, rcs...) }
return rs, ls, closer, nil
}
@ -886,11 +887,16 @@ func (w *WAL) seq() uint64 {
return seq
}
func closeAll(rcs ...io.ReadCloser) error {
func closeAll(lg *zap.Logger, rcs ...io.ReadCloser) error {
stringArr := make([]string, 0)
for _, f := range rcs {
if err := f.Close(); err != nil {
return err
lg.Warn("failed to close: ", zap.Error(err))
stringArr = append(stringArr, err.Error())
}
}
return nil
if len(stringArr) == 0 {
return nil
}
return errors.New(strings.Join(stringArr, ", "))
}