extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 08:23:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

vfs: remove item.metaDirty as it was confusing and not used

Browse Source 
See discussion in #5277
This commit is contained in:
Nick Craig-Wood 2021-04-27 10:30:18 +01:00
parent 00a0ee1899
commit 16d1da2c1e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vfs/vfscache/item.go
View File

@ -63,7 +63,6 @@ type Item struct {
downloaders *downloaders.Downloaders // a record of the downloaders in action - may be nil downloaders *downloaders.Downloaders // a record of the downloaders in action - may be nil
o fs.Object // object we are caching - may be nil o fs.Object // object we are caching - may be nil
fd *os.File // handle we are using to read and write to the file fd *os.File // handle we are using to read and write to the file
metaDirty bool // set if the info needs writeback
modified bool // set if the file has been modified since the last Open modified bool // set if the file has been modified since the last Open
info Info // info about the file to persist to backing store info Info // info about the file to persist to backing store
writeBackID writeback.Handle // id of any writebacks in progress writeBackID writeback.Handle // id of any writebacks in progress
@ -170,7 +169,7 @@ func newItem(c *Cache, name string) (item *Item) {
func (item *Item) inUse() bool { func (item *Item) inUse() bool {
item.mu.Lock() item.mu.Lock()
defer item.mu.Unlock() defer item.mu.Unlock()
return item.opens != 0 || item.metaDirty || item.info.Dirty return item.opens != 0 || item.info.Dirty
} }
// getATime returns the ATime of the item // getATime returns the ATime of the item
@ -208,7 +207,6 @@ func (item *Item) load() (exists bool, err error) {
if err != nil { if err != nil {
return true, errors.Wrap(err, "vfs cache item: corrupt metadata") return true, errors.Wrap(err, "vfs cache item: corrupt metadata")
} }
item.metaDirty = false
return true, nil return true, nil
} }
@ -228,7 +226,6 @@ func (item *Item) _save() (err error) {
if err != nil { if err != nil {
return errors.Wrap(err, "vfs cache item: failed to encode metadata") return errors.Wrap(err, "vfs cache item: failed to encode metadata")
} }
item.metaDirty = false
return nil return nil
} }
@ -425,7 +422,6 @@ func (item *Item) Exists() bool {
func (item *Item) _dirty() { func (item *Item) _dirty() {
item.info.ModTime = time.Now() item.info.ModTime = time.Now()
item.info.ATime = item.info.ModTime item.info.ATime = item.info.ModTime
item.metaDirty = true
if !item.modified { if !item.modified {
item.modified = true item.modified = true
item.mu.Unlock() item.mu.Unlock()
@ -804,7 +800,6 @@ func (item *Item) _checkObject(o fs.Object) error {
// remote object && no local object // remote object && no local object
// Set fingerprint // Set fingerprint
item.info.Fingerprint = remoteFingerprint item.info.Fingerprint = remoteFingerprint
item.metaDirty = true
} }
item.info.Size = o.Size() item.info.Size = o.Size()
} }
@ -867,7 +862,6 @@ func (item *Item) _remove(reason string) (wasWriting bool) {
wasWriting = item.c.writeback.Remove(item.writeBackID) wasWriting = item.c.writeback.Remove(item.writeBackID)
item.mu.Lock() item.mu.Lock()
item.info.clean() item.info.clean()
item.metaDirty = false
item._removeFile(reason) item._removeFile(reason)
item._removeMeta(reason) item._removeMeta(reason)
return wasWriting return wasWriting
@ -892,7 +886,7 @@ func (item *Item) RemoveNotInUse(maxAge time.Duration, emptyOnly bool) (removed
spaceFreed = 0 spaceFreed = 0
removed = false removed = false
if item.opens != 0 || item.metaDirty || item.info.Dirty { if item.opens != 0 || item.info.Dirty {
return return
} }
@ -928,7 +922,7 @@ func (item *Item) Reset() (rr ResetResult, spaceFreed int64, err error) {
defer item.mu.Unlock() defer item.mu.Unlock()
// The item is not being used now. Just remove it instead of resetting it. // The item is not being used now. Just remove it instead of resetting it.
if item.opens == 0 && !item.metaDirty && !item.info.Dirty { if item.opens == 0 && !item.info.Dirty {
spaceFreed = item.info.Rs.Size() spaceFreed = item.info.Rs.Size()
if item._remove("Removing old cache file not in use") { if item._remove("Removing old cache file not in use") {
fs.Errorf(item.name, "item removed when it was writing/uploaded") fs.Errorf(item.name, "item removed when it was writing/uploaded")
@ -1152,7 +1146,6 @@ func (item *Item) _ensure(offset, size int64) (err error) {
func (item *Item) _written(offset, size int64) { func (item *Item) _written(offset, size int64) {
// defer log.Trace(item.name, "offset=%d, size=%d", offset, size)("") // defer log.Trace(item.name, "offset=%d, size=%d", offset, size)("")
item.info.Rs.Insert(ranges.Range{Pos: offset, Size: size}) item.info.Rs.Insert(ranges.Range{Pos: offset, Size: size})
item.metaDirty = true
} }
// update the fingerprint of the object if any // update the fingerprint of the object if any
@ -1166,7 +1159,6 @@ func (item *Item) _updateFingerprint() {
item.info.Fingerprint = fs.Fingerprint(context.TODO(), item.o, false) item.info.Fingerprint = fs.Fingerprint(context.TODO(), item.o, false)
if oldFingerprint != item.info.Fingerprint { if oldFingerprint != item.info.Fingerprint {
fs.Debugf(item.o, "vfs cache: fingerprint now %q", item.info.Fingerprint) fs.Debugf(item.o, "vfs cache: fingerprint now %q", item.info.Fingerprint)
item.metaDirty = true
} }
} }