octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 21:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Don't fail operation when fsync() fails (fixes #5704) (#5705)

Browse Source
This commit is contained in:
Jakob Borg 2019-05-09 22:20:29 +02:00 committed by Audrius Butkevicius
parent 62a6d619e7
commit 31be810eb6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/model/sharedpullerstate.go
View File

@ -280,13 +280,15 @@ func (s *sharedPullerState) finalClose() (bool, error) {
} }
if s.fd != nil { if s.fd != nil {
// This is our error if we weren't errored before. Otherwise we if err := s.fd.Sync(); err != nil {
// keep the earlier error. // Sync() is nice if it works but not worth failing the
if fsyncErr := s.fd.Sync(); fsyncErr != nil && s.err == nil { // operation over if it fails.
s.err = fsyncErr l.Debugf("fsync %q failed: %v", s.tempName, err)
} }
if closeErr := s.fd.Close(); closeErr != nil && s.err == nil {
s.err = closeErr if err := s.fd.Close(); err != nil && s.err == nil {
// This is our error as we weren't errored before.
s.err = err
} }
s.fd = nil s.fd = nil
} }