gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monitor write pattern: avoid timing due to locking

Browse Source
This commit is contained in:
chrislu
2021-12-28 01:10:35 -08:00
parent 80db8b13d8
commit 2422556456
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/filesys/filehandle.go
View File

@@ -3,7 +3,6 @@ package filesys
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filesys/page_writer"
"io" "io"
"math" "math"
"net/http" "net/http"
@@ -21,7 +20,7 @@ import (
type FileHandle struct { type FileHandle struct {
// cache file has been written to // cache file has been written to
dirtyPages page_writer.DirtyPages dirtyPages *PageWriter
entryViewCache []filer.VisibleInterval entryViewCache []filer.VisibleInterval
reader io.ReaderAt reader io.ReaderAt
contentType string contentType string
@@ -177,6 +176,8 @@ func (fh *FileHandle) Write(ctx context.Context, req *fuse.WriteRequest, resp *f
fh.Add(1) fh.Add(1)
defer fh.Done() defer fh.Done()
fh.dirtyPages.writerPattern.MonitorWriteAt(req.Offset, len(req.Data))
fh.Lock() fh.Lock()
defer fh.Unlock() defer fh.Unlock()

2
weed/filesys/page_writer.go
View File

@@ -35,8 +35,6 @@ func newPageWriter(file *File, chunkSize int64) *PageWriter {
func (pw *PageWriter) AddPage(offset int64, data []byte) { func (pw *PageWriter) AddPage(offset int64, data []byte) {
pw.writerPattern.MonitorWriteAt(offset, len(data))
glog.V(4).Infof("%v AddPage [%d, %d) streaming:%v", pw.f.fullpath(), offset, offset+int64(len(data)), pw.writerPattern.IsStreamingMode()) glog.V(4).Infof("%v AddPage [%d, %d) streaming:%v", pw.f.fullpath(), offset, offset+int64(len(data)), pw.writerPattern.IsStreamingMode())
chunkIndex := offset / pw.chunkSize chunkIndex := offset / pw.chunkSize