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

tail volume: fix zero cookie problem from batch deletion

Browse Source
This commit is contained in:
Chris Lu
2021-08-13 01:54:35 -07:00
parent 5a0f92423e
commit a8617c1a39
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/storage/volume_write.go
View File

@@ -143,7 +143,10 @@ func (v *Volume) doWriteRequest(n *needle.Needle) (offset uint64, size Size, isU
err = fmt.Errorf("reading existing needle: %v", existingNeedleReadErr) err = fmt.Errorf("reading existing needle: %v", existingNeedleReadErr)
return return
} }
if existingNeedle.Cookie != n.Cookie { if n.Cookie == 0 {
// this is from batch deletion, and read back again when tailing a remote volume
n.Cookie = existingNeedle.Cookie
} else if existingNeedle.Cookie != n.Cookie {
glog.V(0).Infof("write cookie mismatch: existing %s, new %s", glog.V(0).Infof("write cookie mismatch: existing %s, new %s",
needle.NewFileIdFromNeedle(v.Id, existingNeedle), needle.NewFileIdFromNeedle(v.Id, n)) needle.NewFileIdFromNeedle(v.Id, existingNeedle), needle.NewFileIdFromNeedle(v.Id, n))
err = fmt.Errorf("mismatching cookie %x", n.Cookie) err = fmt.Errorf("mismatching cookie %x", n.Cookie)