diff options
| -rw-r--r-- | weed/filesys/dirty_pages.go | 2 | ||||
| -rw-r--r-- | weed/filesys/dirty_pages_continuous.go | 10 | ||||
| -rw-r--r-- | weed/filesys/filehandle.go | 2 | ||||
| -rw-r--r-- | weed/filesys/wfs.go | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/weed/filesys/dirty_pages.go b/weed/filesys/dirty_pages.go index c056a09ba..8505323ef 100644 --- a/weed/filesys/dirty_pages.go +++ b/weed/filesys/dirty_pages.go @@ -5,4 +5,6 @@ type DirtyPages interface { FlushData() error ReadDirtyDataAt(data []byte, startOffset int64) (maxStop int64) GetStorageOptions() (collection, replication string) + SetWriteOnly(writeOnly bool) + GetWriteOnly() (writeOnly bool) } diff --git a/weed/filesys/dirty_pages_continuous.go b/weed/filesys/dirty_pages_continuous.go index b4ec88c21..b7514a2eb 100644 --- a/weed/filesys/dirty_pages_continuous.go +++ b/weed/filesys/dirty_pages_continuous.go @@ -148,3 +148,13 @@ func (pages *ContinuousDirtyPages) ReadDirtyDataAt(data []byte, startOffset int6 func (pages *ContinuousDirtyPages) GetStorageOptions() (collection, replication string) { return pages.collection, pages.replication } + +func (pages *ContinuousDirtyPages) SetWriteOnly(writeOnly bool) { + if pages.writeOnly { + pages.writeOnly = writeOnly + } +} + +func (pages *ContinuousDirtyPages) GetWriteOnly() (writeOnly bool) { + return pages.writeOnly +} diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index b23063e28..7a939e87a 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -284,7 +284,7 @@ func (fh *FileHandle) doFlush(ctx context.Context, header fuse.Header) error { manifestChunks, nonManifestChunks := filer.SeparateManifestChunks(entry.Chunks) chunks, _ := filer.CompactFileChunks(fh.f.wfs.LookupFn(), nonManifestChunks) - chunks, manifestErr := filer.MaybeManifestize(fh.f.wfs.saveDataAsChunk(fh.f.fullpath(), fh.writeOnly), chunks) + chunks, manifestErr := filer.MaybeManifestize(fh.f.wfs.saveDataAsChunk(fh.f.fullpath(), fh.dirtyPages.GetWriteOnly()), chunks) if manifestErr != nil { // not good, but should be ok glog.V(0).Infof("MaybeManifestize: %v", manifestErr) diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index c71931b02..4096d3595 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -150,9 +150,7 @@ func (wfs *WFS) AcquireHandle(file *File, uid, gid uint32, writeOnly bool) (file wfs.handlesLock.Unlock() if found && existingHandle != nil { existingHandle.f.isOpen++ - if existingHandle.writeOnly { - existingHandle.writeOnly = writeOnly - } + existingHandle.dirtyPages.SetWriteOnly(writeOnly) glog.V(4).Infof("Acquired Handle %s open %d", fullpath, existingHandle.f.isOpen) return existingHandle } |