diff options
| author | Patrick Schmidt <patrick.schmidt@innogames.com> | 2022-08-27 01:41:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 16:41:37 -0700 |
| commit | 5df105b1f94b8776d18159ae213da39299e2ea37 (patch) | |
| tree | 947bd9517ff31f6927dcaed3019c117179073a48 /weed/mount/filehandle.go | |
| parent | f5156cf3a8d08622574865532ef5139537384b40 (diff) | |
| download | seaweedfs-5df105b1f94b8776d18159ae213da39299e2ea37.tar.xz seaweedfs-5df105b1f94b8776d18159ae213da39299e2ea37.zip | |
Fix a few data races when reading files in mount (#3527)
Diffstat (limited to 'weed/mount/filehandle.go')
| -rw-r--r-- | weed/mount/filehandle.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/weed/mount/filehandle.go b/weed/mount/filehandle.go index 8175c61f4..4595764ee 100644 --- a/weed/mount/filehandle.go +++ b/weed/mount/filehandle.go @@ -1,12 +1,14 @@ package mount import ( + "sync" + + "golang.org/x/exp/slices" + "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" - "golang.org/x/exp/slices" - "sync" ) type FileHandleId uint64 @@ -57,12 +59,20 @@ func (fh *FileHandle) GetEntry() *filer_pb.Entry { defer fh.entryLock.Unlock() return fh.entry } + func (fh *FileHandle) SetEntry(entry *filer_pb.Entry) { fh.entryLock.Lock() defer fh.entryLock.Unlock() fh.entry = entry } +func (fh *FileHandle) UpdateEntry(fn func(entry *filer_pb.Entry)) *filer_pb.Entry { + fh.entryLock.Lock() + defer fh.entryLock.Unlock() + fn(fh.entry) + return fh.entry +} + func (fh *FileHandle) AddChunks(chunks []*filer_pb.FileChunk) { fh.entryLock.Lock() defer fh.entryLock.Unlock() |