github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-12-02 11:53:45 +01:00
Code Releases Activity

vfs: fix a code path which allows dirty data to be removed causing data loss

Browse Source 
Before this change the VFS layer could remove a locally cached file
even if it had data which needed to be written back, thus causing data loss.

See: https://forum.rclone.org/t/rclone-1-55-doesnt-save-file-changes-if-the-file-has-been-reopened-during-upload-google-drive-mount/23646
This commit is contained in:
Nick Craig-Wood 2021-04-19 23:10:16 +01:00
parent 9799fdbae2
commit 2a40f00077
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vfs/vfscache/item.go
View File

@ -774,6 +774,9 @@ func (item *Item) reload(ctx context.Context) error {
// check the fingerprint of an object and update the item or delete // check the fingerprint of an object and update the item or delete
// the cached file accordingly // the cached file accordingly
// //
// If we have local modifications then they take precedence
// over a change in the remote
//
// It ensures the file is the correct size for the object // It ensures the file is the correct size for the object
// //
// call with lock held // call with lock held
@ -781,8 +784,12 @@ func (item *Item) _checkObject(o fs.Object) error {
if o == nil { if o == nil {
if item.info.Fingerprint != "" { if item.info.Fingerprint != "" {
// no remote object && local object // no remote object && local object
// remove local object // remove local object unless dirty
item._remove("stale (remote deleted)") if !item.info.Dirty {
item._remove("stale (remote deleted)")
} else {
fs.Debugf(item.name, "vfs cache: remote object has gone but local object modified - keeping it")
}
} else { } else {
// no remote object && no local object // no remote object && no local object
// OK // OK
@ -793,8 +800,12 @@ func (item *Item) _checkObject(o fs.Object) error {
if item.info.Fingerprint != "" { if item.info.Fingerprint != "" {
// remote object && local object // remote object && local object
if remoteFingerprint != item.info.Fingerprint { if remoteFingerprint != item.info.Fingerprint {
fs.Debugf(item.name, "vfs cache: removing cached entry as stale (remote fingerprint %q != cached fingerprint %q)", remoteFingerprint, item.info.Fingerprint) if !item.info.Dirty {
item._remove("stale (remote is different)") fs.Debugf(item.name, "vfs cache: removing cached entry as stale (remote fingerprint %q != cached fingerprint %q)", remoteFingerprint, item.info.Fingerprint)
item._remove("stale (remote is different)")
} else {
fs.Debugf(item.name, "vfs cache: remote object has changed but local object modified - keeping it (remote fingerprint %q != cached fingerprint %q)", remoteFingerprint, item.info.Fingerprint)
}
} }
} else { } else {
// remote object && no local object // remote object && no local object