lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 18:17:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wait to read again if the volume is compacting

Browse Source
This commit is contained in:
Chris Lu
2019-01-05 19:52:17 -08:00
parent fe50224ea0
commit 9383c91eb1
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/storage/volume_read_write.go
View File

@@ -12,6 +12,8 @@ import (
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
var ErrorNotFound = errors.New("not found")
// isFileUnchanged checks whether this needle to write is same as last one.
// It requires serialized access in the same volume.
func (v *Volume) isFileUnchanged(n *Needle) bool {
@@ -134,7 +136,11 @@ func (v *Volume) deleteNeedle(n *Needle) (uint32, error) {
func (v *Volume) readNeedle(n *Needle) (int, error) {
nv, ok := v.nm.Get(n.Id)
if !ok || nv.Offset == 0 {
return -1, errors.New("Not Found")
v.compactingWg.Wait()
nv, ok = v.nm.Get(n.Id)
if !ok || nv.Offset == 0 {
return -1, ErrorNotFound
}
}
if nv.Size == TombstoneFileSize {
return -1, errors.New("Already Deleted")