From 0ae4d7bfdfb1318c71d64ba395c27882f9b3fd6a Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 3 Nov 2020 12:20:41 -0800 Subject: [PATCH] lock "addChunks()" --- weed/filesys/dirty_page.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go index c1b78a220..11089186f 100644 --- a/weed/filesys/dirty_page.go +++ b/weed/filesys/dirty_page.go @@ -15,10 +15,10 @@ type ContinuousDirtyPages struct { intervals *ContinuousIntervals f *File writeWaitGroup sync.WaitGroup + chunkAddLock sync.Mutex chunkSaveErrChan chan error chunkSaveErrChanClosed bool lastErr error - lock sync.Mutex collection string replication string } @@ -117,6 +117,8 @@ func (pages *ContinuousDirtyPages) saveToStorage(reader io.Reader, offset int64, } chunk.Mtime = mtime pages.collection, pages.replication = collection, replication + pages.chunkAddLock.Lock() + defer pages.chunkAddLock.Unlock() pages.f.addChunks([]*filer_pb.FileChunk{chunk}) glog.V(3).Infof("%s saveToStorage [%d,%d)", pages.f.fullpath(), offset, offset+size) }