lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-11-08 23:14:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Jaehoon Kim
2025-10-17 04:21:51 +09:00
committed by GitHub
parent 3d25f206c8
commit d22e3d3495
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/storage/needle_map_memory.go
View File

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

2
weed/storage/volume_write.go
View File

@@ -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()) glog.V(4).Infof("delete needle %s", needle.NewFileIdFromNeedle(v.Id, n).String())
nv, ok := v.nm.Get(n.Id) nv, ok := v.nm.Get(n.Id)
// fmt.Println("key", n.Id, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size) // 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 offset uint64
var err error var err error
size := nv.Size size := nv.Size