diff options
| author | Jaehoon Kim <kisow.github.io@navercorp.com> | 2025-10-17 04:21:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-16 12:21:51 -0700 |
| commit | d22e3d3495b962c7654414f7fa88b07ee06e4c16 (patch) | |
| tree | 59bcc19409206137576542228d16b286d27ffdf6 | |
| parent | 3d25f206c83e893d6dc5ea419a8702f0f44655e0 (diff) | |
| download | seaweedfs-d22e3d3495b962c7654414f7fa88b07ee06e4c16.tar.xz seaweedfs-d22e3d3495b962c7654414f7fa88b07ee06e4c16.zip | |
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
| -rw-r--r-- | weed/storage/needle_map_memory.go | 2 | ||||
| -rw-r--r-- | weed/storage/volume_write.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go index c75514a31..c00c75010 100644 --- a/weed/storage/needle_map_memory.go +++ b/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) diff --git a/weed/storage/volume_write.go b/weed/storage/volume_write.go index 2dc94851c..8cb00bc15 100644 --- a/weed/storage/volume_write.go +++ b/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 |