diff options
Diffstat (limited to 'weed/storage/volume_read.go')
| -rw-r--r-- | weed/storage/volume_read.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/weed/storage/volume_read.go b/weed/storage/volume_read.go index e18ce9016..f82e3e72d 100644 --- a/weed/storage/volume_read.go +++ b/weed/storage/volume_read.go @@ -164,7 +164,10 @@ func (v *Volume) readNeedleDataInto(n *needle.Needle, readOption *ReadOption, wr toWrite := min(count, int(offset+size-x)) if toWrite > 0 { crc = crc.Update(buf[0:toWrite]) - if offset == 0 && size == int64(n.DataSize) && int64(count) == size && (n.Checksum != crc) { + // the crc.Value() function is to be deprecated. this double checking is for backward compatibility + // with seaweed version using crc.Value() instead of uint32(crc), which appears in commit 056c480eb + // and switch appeared in version 3.09. + if offset == 0 && size == int64(n.DataSize) && int64(count) == size && (n.Checksum != crc && uint32(n.Checksum) != crc.Value()) { // This check works only if the buffer is big enough to hold the whole needle data // and we ask for all needle data. // Otherwise we cannot check the validity of partially aquired data. @@ -187,7 +190,9 @@ func (v *Volume) readNeedleDataInto(n *needle.Needle, readOption *ReadOption, wr } } if offset == 0 && size == int64(n.DataSize) && (n.Checksum != crc && uint32(n.Checksum) != crc.Value()) { - // the crc.Value() function is to be deprecated. this double checking is for backward compatible. + // the crc.Value() function is to be deprecated. this double checking is for backward compatibility + // with seaweed version using crc.Value() instead of uint32(crc), which appears in commit 056c480eb + // and switch appeared in version 3.09. stats.VolumeServerHandlerCounter.WithLabelValues(stats.ErrorCRC).Inc() return fmt.Errorf("ReadNeedleData checksum %v expected %v for Needle: %v,%v", crc, n.Checksum, v.Id, n) } |