diff options
| author | skycope <wings.wyang@gmail.com> | 2024-01-16 08:16:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 16:16:46 -0800 |
| commit | 316ae4579539273e61bb1a82aa818b66a2e736ef (patch) | |
| tree | 82f0265779dbbe30ca4cb3681995e4a881bf3fae | |
| parent | c82236b41bf6ed715c9bc5e40618c11114f27bdd (diff) | |
| download | seaweedfs-316ae4579539273e61bb1a82aa818b66a2e736ef.tar.xz seaweedfs-316ae4579539273e61bb1a82aa818b66a2e736ef.zip | |
can vacuum volume when size mismatch (#5200)
Co-authored-by: Yang Wang <yangwang@weride.ai>
| -rw-r--r-- | weed/storage/needle/needle_read.go | 12 | ||||
| -rw-r--r-- | weed/storage/volume_checking.go | 3 | ||||
| -rw-r--r-- | weed/storage/volume_read.go | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/weed/storage/needle/needle_read.go b/weed/storage/needle/needle_read.go index 19b801bd4..1041e924d 100644 --- a/weed/storage/needle/needle_read.go +++ b/weed/storage/needle/needle_read.go @@ -93,7 +93,17 @@ func (n *Needle) ReadData(r backend.BackendStorageFile, offset int64, size Size, if err != nil { return err } - return n.ReadBytes(bytes, offset, size, version) + + err = n.ReadBytes(bytes, offset, size, version) + if err == ErrorSizeMismatch && OffsetSize == 4 { + offset = offset + int64(MaxPossibleVolumeSize) + bytes, err = ReadNeedleBlob(r, offset, size, version) + if err != nil { + return err + } + err = n.ReadBytes(bytes, offset, size, version) + } + return err } func (n *Needle) ParseNeedleHeader(bytes []byte) { diff --git a/weed/storage/volume_checking.go b/weed/storage/volume_checking.go index e10fedf9b..0f92a2e93 100644 --- a/weed/storage/volume_checking.go +++ b/weed/storage/volume_checking.go @@ -60,6 +60,9 @@ func doCheckAndFixVolumeData(v *Volume, indexFile *os.File, indexOffset int64) ( } } else { if lastAppendAtNs, err = verifyNeedleIntegrity(v.DataBackend, v.Version(), offset.ToActualOffset(), key, size); err != nil { + if err == ErrorSizeMismatch { + return verifyNeedleIntegrity(v.DataBackend, v.Version(), offset.ToActualOffset()+int64(MaxPossibleVolumeSize), key, size) + } return lastAppendAtNs, err } } diff --git a/weed/storage/volume_read.go b/weed/storage/volume_read.go index 8e9717689..09fbdd701 100644 --- a/weed/storage/volume_read.go +++ b/weed/storage/volume_read.go @@ -55,9 +55,6 @@ func (v *Volume) readNeedle(n *needle.Needle, readOption *ReadOption, onReadSize } if readOption == nil || !readOption.IsMetaOnly { err = n.ReadData(v.DataBackend, nv.Offset.ToActualOffset(), readSize, v.Version()) - if err == needle.ErrorSizeMismatch && OffsetSize == 4 { - err = n.ReadData(v.DataBackend, nv.Offset.ToActualOffset()+int64(MaxPossibleVolumeSize), readSize, v.Version()) - } v.checkReadWriteError(err) if err != nil { return 0, err |