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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
weed/storage/needle_map_memory.go
weed/storage/volume_write.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 . IsVali d ( ) {
if ! offset . IsZero ( ) && ! size . IsDelete d ( ) {
nm . FileCounter ++
nm . FileByteCounter = nm . FileByteCounter + uint64 ( size )
oldOffset , oldSize := nm . m . Set ( NeedleId ( key ) , offset , size )
@ -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 . IsVali d ( ) {
if ok && ! nv . Size . IsDelete d ( ) {
var offset uint64
var err error
size := nv . Size