extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-09 15:58:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

vfs: fix deletion of in use directories #1860

Browse Source 
This was causing errors if the cache cleaner was called between the
Open and the pendingOpen of a RW file.

The fix was to move the cache open to the Open from the openPending.
This commit is contained in:
Nick Craig-Wood 2017-12-15 15:42:49 +00:00
parent 2a01fa9fa0
commit 29d34426bc
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vfs/cache.go
View File

@ -267,6 +267,9 @@ func (c *cache) removeDir(dir string) bool {
osPath := c.toOSPath(dir) osPath := c.toOSPath(dir)
err := os.Remove(osPath) err := os.Remove(osPath)
if err == nil || os.IsNotExist(err) { if err == nil || os.IsNotExist(err) {
if err == nil {
fs.Debugf(dir, "Removed empty directory")
}
return true return true
} }
if !os.IsExist(err) { if !os.IsExist(err) {

20
vfs/read_write.go
View File

@ -39,12 +39,6 @@ var (
) )
func newRWFileHandle(d *Dir, f *File, remote string, flags int) (fh *RWFileHandle, err error) { func newRWFileHandle(d *Dir, f *File, remote string, flags int) (fh *RWFileHandle, err error) {
// Make a place for the file
osPath, err := d.vfs.cache.mkdir(remote)
if err != nil {
return nil, errors.Wrap(err, "open RW handle failed to make cache directory")
}
// if O_CREATE and O_EXCL are set and if path already exists, then return EEXIST // if O_CREATE and O_EXCL are set and if path already exists, then return EEXIST
if flags&(os.O_CREATE|os.O_EXCL) == os.O_CREATE|os.O_EXCL && f.exists() { if flags&(os.O_CREATE|os.O_EXCL) == os.O_CREATE|os.O_EXCL && f.exists() {
return nil, EEXIST return nil, EEXIST
@ -56,7 +50,16 @@ func newRWFileHandle(d *Dir, f *File, remote string, flags int) (fh *RWFileHandl
d: d, d: d,
remote: remote, remote: remote,
flags: flags, flags: flags,
osPath: osPath, }
// mark the file as open in the cache - must be done before the mkdir
fh.d.vfs.cache.open(fh.remote)
// Make a place for the file
fh.osPath, err = d.vfs.cache.mkdir(remote)
if err != nil {
fh.d.vfs.cache.close(fh.remote)
return nil, errors.Wrap(err, "open RW handle failed to make cache directory")
} }
rdwrMode := fh.flags & accessModeMask rdwrMode := fh.flags & accessModeMask
@ -129,7 +132,6 @@ func (fh *RWFileHandle) openPending(truncate bool) (err error) {
} }
fh.File = fd fh.File = fd
fh.opened = true fh.opened = true
fh.d.vfs.cache.open(fh.remote)
fh.d.addObject(fh.file) // make sure the directory has this object in it now fh.d.addObject(fh.file) // make sure the directory has this object in it now
return nil return nil
} }
@ -167,6 +169,7 @@ func (fh *RWFileHandle) close() (err error) {
return ECLOSED return ECLOSED
} }
fh.closed = true fh.closed = true
defer fh.d.vfs.cache.close(fh.remote)
rdwrMode := fh.flags & accessModeMask rdwrMode := fh.flags & accessModeMask
if rdwrMode != os.O_RDONLY { if rdwrMode != os.O_RDONLY {
// leave writer open until file is transferred // leave writer open until file is transferred
@ -196,7 +199,6 @@ func (fh *RWFileHandle) close() (err error) {
fh.file.setSize(fi.Size()) fh.file.setSize(fi.Size())
} }
} }
fh.d.vfs.cache.close(fh.remote)
// Close the underlying file // Close the underlying file
err = fh.File.Close() err = fh.File.Close()