Browse Source

Fix uncleanable orphans issue with `volume.fsck -forcePurging` (#7332)

- Modified `needle_map_memory.go` to include needles with size=0 during needle map loading
- Updated `volume_write.go` to handle size=0 needles in delete operations
master
Jaehoon Kim 2 days ago
committed by GitHub
parent
commit
d22e3d3495
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      weed/storage/needle_map_memory.go
  2. 2
      weed/storage/volume_write.go

2
weed/storage/needle_map_memory.go

@ -36,7 +36,7 @@ func LoadCompactNeedleMap(file *os.File) (*NeedleMap, error) {
func doLoading(file *os.File, nm *NeedleMap) (*NeedleMap, error) {
e := idx.WalkIndexFile(file, 0, func(key NeedleId, offset Offset, size Size) error {
nm.MaybeSetMaxFileKey(key)
if !offset.IsZero() && size.IsValid() {
if !offset.IsZero() && !size.IsDeleted() {
nm.FileCounter++
nm.FileByteCounter = nm.FileByteCounter + uint64(size)
oldOffset, oldSize := nm.m.Set(NeedleId(key), offset, size)

2
weed/storage/volume_write.go

@ -221,7 +221,7 @@ func (v *Volume) doDeleteRequest(n *needle.Needle) (Size, error) {
glog.V(4).Infof("delete needle %s", needle.NewFileIdFromNeedle(v.Id, n).String())
nv, ok := v.nm.Get(n.Id)
// fmt.Println("key", n.Id, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size)
if ok && nv.Size.IsValid() {
if ok && !nv.Size.IsDeleted() {
var offset uint64
var err error
size := nv.Size

Loading…
Cancel
Save