diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-11-14 22:48:54 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-11-14 22:48:54 -0800 |
| commit | 2e6a3c7b160e499d91e990d9c65dab9ff1fd6be7 (patch) | |
| tree | d9f94b0f54aa9f3c1a3499e7fd4075e49d37e13c /weed/filesys | |
| parent | f224b9fe284eb34c4c5f5223df50db93e5fd4677 (diff) | |
| download | seaweedfs-2e6a3c7b160e499d91e990d9c65dab9ff1fd6be7.tar.xz seaweedfs-2e6a3c7b160e499d91e990d9c65dab9ff1fd6be7.zip | |
reduce memory usage
Diffstat (limited to 'weed/filesys')
| -rw-r--r-- | weed/filesys/dirty_page.go | 8 | ||||
| -rw-r--r-- | weed/filesys/filehandle.go | 9 | ||||
| -rw-r--r-- | weed/filesys/wfs.go | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go index 858858a30..91a952421 100644 --- a/weed/filesys/dirty_page.go +++ b/weed/filesys/dirty_page.go @@ -28,6 +28,14 @@ func newDirtyPages(file *File) *ContinuousDirtyPages { } } +func (pages *ContinuousDirtyPages) InitializeToFile(file *File) *ContinuousDirtyPages { + if len(pages.Data) != int(file.wfs.option.ChunkSizeLimit) { + pages.Data = make([]byte, file.wfs.option.ChunkSizeLimit) + } + pages.f = file + return pages +} + func (pages *ContinuousDirtyPages) AddPage(ctx context.Context, offset int64, data []byte) (chunks []*filer_pb.FileChunk, err error) { pages.lock.Lock() diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index b15aa68d9..78ae5d342 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -37,6 +37,15 @@ func newFileHandle(file *File, uid, gid uint32) *FileHandle { } } +func (fh *FileHandle) InitializeToFile(file *File, uid, gid uint32) *FileHandle { + newHandle := &FileHandle{ + f: file, + dirtyPages: fh.dirtyPages.InitializeToFile(file), + Uid: uid, + Gid: gid, + } + return newHandle +} var _ = fs.Handle(&FileHandle{}) // var _ = fs.HandleReadAller(&FileHandle{}) diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 4520f2eb5..eca74d1d6 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -72,15 +72,14 @@ func (wfs *WFS) AcquireHandle(file *File, uid, gid uint32) (fileHandle *FileHand return wfs.handles[index] } - fileHandle = newFileHandle(file, uid, gid) - if found && wfs.handles[index] != nil { glog.V(4).Infoln(fullpath, "reuse previous fileHandle id", index) - wfs.handles[index] = fileHandle + wfs.handles[index].InitializeToFile(file, uid, gid) fileHandle.handle = uint64(index) return } + fileHandle = newFileHandle(file, uid, gid) for i, h := range wfs.handles { if h == nil { wfs.handles[i] = fileHandle |
