diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2019-01-16 16:48:03 +0800 |
|---|---|---|
| committer | bingoohuang <bingoo.huang@gmail.com> | 2019-01-16 16:48:03 +0800 |
| commit | 27093bc2e5cf3d61149e5eda14b98b1e527e5a28 (patch) | |
| tree | 217eea7ae471a570e8ee2650cfd9b37dab78dc92 /weed/storage/volume_read_write.go | |
| parent | 7081261fca0bc795c868e2390deeb8894c0dd9a0 (diff) | |
| download | seaweedfs-27093bc2e5cf3d61149e5eda14b98b1e527e5a28.tar.xz seaweedfs-27093bc2e5cf3d61149e5eda14b98b1e527e5a28.zip | |
fix needle Append return offset to avoid uint32 overflow
Diffstat (limited to 'weed/storage/volume_read_write.go')
| -rw-r--r-- | weed/storage/volume_read_write.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go index 32062db46..66f90634f 100644 --- a/weed/storage/volume_read_write.go +++ b/weed/storage/volume_read_write.go @@ -76,7 +76,7 @@ func (v *Volume) AppendBlob(b []byte) (offset int64, err error) { return } -func (v *Volume) writeNeedle(n *Needle) (offset Offset, size uint32, err error) { +func (v *Volume) writeNeedle(n *Needle) (offset uint64, size uint32, err error) { glog.V(4).Infof("writing needle %s", NewFileIdFromNeedle(v.Id, n).String()) if v.readOnly { err = fmt.Errorf("%s is read-only", v.dataFile.Name()) @@ -96,8 +96,8 @@ func (v *Volume) writeNeedle(n *Needle) (offset Offset, size uint32, err error) } nv, ok := v.nm.Get(n.Id) - if !ok || Offset(nv.Offset)*NeedlePaddingSize < offset { - if err = v.nm.Put(n.Id, offset/NeedlePaddingSize, n.Size); err != nil { + if !ok || uint64(nv.Offset)*NeedlePaddingSize < offset { + if err = v.nm.Put(n.Id, Offset(offset/NeedlePaddingSize), n.Size); err != nil { glog.V(4).Infof("failed to save in needle map %d: %v", n.Id, err) } } @@ -124,7 +124,7 @@ func (v *Volume) deleteNeedle(n *Needle) (uint32, error) { if err != nil { return size, err } - if err = v.nm.Delete(n.Id, offset/NeedlePaddingSize); err != nil { + if err = v.nm.Delete(n.Id, Offset(offset/NeedlePaddingSize)); err != nil { return size, err } return size, err |