aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--weed/filer/filechunk_section.go30
-rw-r--r--weed/filer/interval_list.go6
-rw-r--r--weed/filer/reader_at.go8
-rw-r--r--weed/mount/filehandle.go7
-rw-r--r--weed/mount/filehandle_read.go4
-rw-r--r--weed/mount/weedfs_dir_lookup.go4
-rw-r--r--weed/mount/weedfs_file_lseek.go8
-rw-r--r--weed/mount/weedfs_file_read.go4
8 files changed, 45 insertions, 26 deletions
diff --git a/weed/filer/filechunk_section.go b/weed/filer/filechunk_section.go
index 11d6e631a..ba591d9ac 100644
--- a/weed/filer/filechunk_section.go
+++ b/weed/filer/filechunk_section.go
@@ -13,7 +13,8 @@ type FileChunkSection struct {
visibleIntervals *IntervalList[*VisibleInterval]
chunkViews *IntervalList[*ChunkView]
reader *ChunkReadAt
- lock sync.Mutex
+ lock sync.RWMutex
+ isPrepared bool
}
func NewFileChunkSection(si SectionIndex) *FileChunkSection {
@@ -61,6 +62,19 @@ func removeGarbageChunks(section *FileChunkSection, garbageFileIds map[string]st
}
func (section *FileChunkSection) setupForRead(group *ChunkGroup, fileSize int64) {
+ if section.isPrepared {
+ section.reader.fileSize = fileSize
+ return
+ }
+
+ section.lock.Lock()
+ defer section.lock.Unlock()
+
+ if section.isPrepared {
+ section.reader.fileSize = fileSize
+ return
+ }
+
if section.visibleIntervals == nil {
section.visibleIntervals = readResolvedChunks(section.chunks, int64(section.sectionIndex)*SectionSize, (int64(section.sectionIndex)+1)*SectionSize)
section.chunks, _ = SeparateGarbageChunks(section.visibleIntervals, section.chunks)
@@ -76,23 +90,25 @@ func (section *FileChunkSection) setupForRead(group *ChunkGroup, fileSize int64)
if section.reader == nil {
section.reader = NewChunkReaderAtFromClient(group.readerCache, section.chunkViews, min(int64(section.sectionIndex+1)*SectionSize, fileSize))
}
+
+ section.isPrepared = true
section.reader.fileSize = fileSize
}
func (section *FileChunkSection) readDataAt(group *ChunkGroup, fileSize int64, buff []byte, offset int64) (n int, tsNs int64, err error) {
- section.lock.Lock()
- defer section.lock.Unlock()
section.setupForRead(group, fileSize)
+ section.lock.RLock()
+ defer section.lock.RUnlock()
return section.reader.ReadAtWithTime(buff, offset)
}
func (section *FileChunkSection) DataStartOffset(group *ChunkGroup, offset int64, fileSize int64) int64 {
- section.lock.Lock()
- defer section.lock.Unlock()
section.setupForRead(group, fileSize)
+ section.lock.RLock()
+ defer section.lock.RUnlock()
for x := section.visibleIntervals.Front(); x != nil; x = x.Next {
visible := x.Value
@@ -108,10 +124,10 @@ func (section *FileChunkSection) DataStartOffset(group *ChunkGroup, offset int64
}
func (section *FileChunkSection) NextStopOffset(group *ChunkGroup, offset int64, fileSize int64) int64 {
- section.lock.Lock()
- defer section.lock.Unlock()
section.setupForRead(group, fileSize)
+ section.lock.RLock()
+ defer section.lock.RUnlock()
isAfterOffset := false
for x := section.visibleIntervals.Front(); x != nil; x = x.Next {
diff --git a/weed/filer/interval_list.go b/weed/filer/interval_list.go
index b3d2a76b9..27720231d 100644
--- a/weed/filer/interval_list.go
+++ b/weed/filer/interval_list.go
@@ -27,7 +27,7 @@ func (interval *Interval[T]) Size() int64 {
type IntervalList[T IntervalValue] struct {
head *Interval[T]
tail *Interval[T]
- Lock sync.Mutex
+ Lock sync.RWMutex
}
func NewIntervalList[T IntervalValue]() *IntervalList[T] {
@@ -248,8 +248,8 @@ func (list *IntervalList[T]) overlayInterval(interval *Interval[T]) {
}
func (list *IntervalList[T]) Len() int {
- list.Lock.Lock()
- defer list.Lock.Unlock()
+ list.Lock.RLock()
+ defer list.Lock.RUnlock()
var count int
for t := list.head; t != nil; t = t.Next {
diff --git a/weed/filer/reader_at.go b/weed/filer/reader_at.go
index 3f32f2a3c..d475e6e11 100644
--- a/weed/filer/reader_at.go
+++ b/weed/filer/reader_at.go
@@ -106,8 +106,8 @@ func (c *ChunkReadAt) ReadAt(p []byte, offset int64) (n int, err error) {
c.readerPattern.MonitorReadAt(offset, len(p))
- c.chunkViews.Lock.Lock()
- defer c.chunkViews.Lock.Unlock()
+ c.chunkViews.Lock.RLock()
+ defer c.chunkViews.Lock.RUnlock()
// glog.V(4).Infof("ReadAt [%d,%d) of total file size %d bytes %d chunk views", offset, offset+int64(len(p)), c.fileSize, len(c.chunkViews))
n, _, err = c.doReadAt(p, offset)
@@ -118,8 +118,8 @@ func (c *ChunkReadAt) ReadAtWithTime(p []byte, offset int64) (n int, ts int64, e
c.readerPattern.MonitorReadAt(offset, len(p))
- c.chunkViews.Lock.Lock()
- defer c.chunkViews.Lock.Unlock()
+ c.chunkViews.Lock.RLock()
+ defer c.chunkViews.Lock.RUnlock()
// glog.V(4).Infof("ReadAt [%d,%d) of total file size %d bytes %d chunk views", offset, offset+int64(len(p)), c.fileSize, len(c.chunkViews))
return c.doReadAt(p, offset)
diff --git a/weed/mount/filehandle.go b/weed/mount/filehandle.go
index 67298b047..fe038a258 100644
--- a/weed/mount/filehandle.go
+++ b/weed/mount/filehandle.go
@@ -17,7 +17,7 @@ type FileHandle struct {
fh FileHandleId
counter int64
entry *LockedEntry
- entryLock sync.Mutex
+ entryLock sync.RWMutex
entryChunkGroup *filer.ChunkGroup
inode uint64
wfs *WFS
@@ -28,7 +28,7 @@ type FileHandle struct {
reader *filer.ChunkReadAt
contentType string
handle uint64
- sync.Mutex
+ sync.RWMutex
isDeleted bool
@@ -103,6 +103,9 @@ func (fh *FileHandle) AddChunks(chunks []*filer_pb.FileChunk) {
}
func (fh *FileHandle) ReleaseHandle() {
+ fh.Lock()
+ defer fh.Unlock()
+
fh.entryLock.Lock()
defer fh.entryLock.Unlock()
diff --git a/weed/mount/filehandle_read.go b/weed/mount/filehandle_read.go
index 0684d0ba4..7b2629c13 100644
--- a/weed/mount/filehandle_read.go
+++ b/weed/mount/filehandle_read.go
@@ -23,8 +23,8 @@ func (fh *FileHandle) readFromDirtyPages(buff []byte, startOffset int64, tsNs in
}
func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, int64, error) {
- fh.entryLock.Lock()
- defer fh.entryLock.Unlock()
+ fh.entryLock.RLock()
+ defer fh.entryLock.RUnlock()
fileFullPath := fh.FullPath()
diff --git a/weed/mount/weedfs_dir_lookup.go b/weed/mount/weedfs_dir_lookup.go
index 2d3ea8ae5..e646b06a9 100644
--- a/weed/mount/weedfs_dir_lookup.go
+++ b/weed/mount/weedfs_dir_lookup.go
@@ -58,12 +58,12 @@ func (wfs *WFS) Lookup(cancel <-chan struct{}, header *fuse.InHeader, name strin
inode := wfs.inodeToPath.Lookup(fullFilePath, localEntry.Crtime.Unix(), localEntry.IsDirectory(), len(localEntry.HardLinkId) > 0, localEntry.Inode, true)
if fh, found := wfs.fhmap.FindFileHandle(inode); found {
- fh.entryLock.Lock()
+ fh.entryLock.RLock()
if entry := fh.GetEntry(); entry != nil {
glog.V(4).Infof("lookup opened file %s size %d", dirPath.Child(localEntry.Name()), filer.FileSize(entry))
localEntry = filer.FromPbEntry(string(dirPath), entry)
}
- fh.entryLock.Unlock()
+ fh.entryLock.RUnlock()
}
wfs.outputFilerEntry(out, inode, localEntry)
diff --git a/weed/mount/weedfs_file_lseek.go b/weed/mount/weedfs_file_lseek.go
index 93fc65247..9dfc4d4f1 100644
--- a/weed/mount/weedfs_file_lseek.go
+++ b/weed/mount/weedfs_file_lseek.go
@@ -35,10 +35,10 @@ func (wfs *WFS) Lseek(cancel <-chan struct{}, in *fuse.LseekIn, out *fuse.LseekO
}
// lock the file until the proper offset was calculated
- fh.Lock()
- defer fh.Unlock()
- fh.entryLock.Lock()
- defer fh.entryLock.Unlock()
+ fh.RLock()
+ defer fh.RUnlock()
+ fh.entryLock.RLock()
+ defer fh.entryLock.RUnlock()
fileSize := int64(filer.FileSize(fh.GetEntry()))
offset := max(int64(in.Offset), 0)
diff --git a/weed/mount/weedfs_file_read.go b/weed/mount/weedfs_file_read.go
index cedece137..95377d9e9 100644
--- a/weed/mount/weedfs_file_read.go
+++ b/weed/mount/weedfs_file_read.go
@@ -41,8 +41,8 @@ func (wfs *WFS) Read(cancel <-chan struct{}, in *fuse.ReadIn, buff []byte) (fuse
return nil, fuse.ENOENT
}
- fh.Lock()
- defer fh.Unlock()
+ fh.RLock()
+ defer fh.RUnlock()
offset := int64(in.Offset)
totalRead, err := readDataByFileHandle(buff, fh, offset)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 21:55:21 +0000