mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-05-18 15:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid caching transient directory marker lookup failures

Browse Source
This commit is contained in:
Copilot
2026-03-21 14:10:29 -07:00
parent 8491001d11
commit f627aa79fc
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/s3/spark/issue_8285_repro_test.go
View File

@@ -70,7 +70,7 @@ print("WRITE_COUNT=" + str(count))
"issue-8285/output/_temporary/0/",
"issue-8285/output/_temporary/0/_temporary/",
}
lingering := waitForObjectsToDisappear(t, env, "test", temporaryCandidates, 35*time.Second)
lingering := waitForObjectsToDisappear(t, env, "test", temporaryCandidates, 60*time.Second)
if len(lingering) > 0 {
t.Fatalf("issue #8285 regression detected: lingering temporary directories: %v", lingering)
}

21
weed/filer/empty_folder_cleanup/empty_folder_cleaner.go
View File

@@ -321,10 +321,13 @@ func (efc *EmptyFolderCleaner) executeCleanup(folder string, triggeredBy string)
isMarker = *state.isDirectoryMarker
} else {
efc.mu.Unlock()
isMarker = efc.isDirectoryMarker(ctx, folder)
var cacheable bool
isMarker, cacheable = efc.isDirectoryMarker(ctx, folder)
efc.mu.Lock()
if state, exists := efc.folderCounts[folder]; exists && state != nil {
state.isDirectoryMarker = &isMarker
if cacheable {
if state, exists := efc.folderCounts[folder]; exists && state != nil {
state.isDirectoryMarker = &isMarker
}
}
}
efc.mu.Unlock()
@@ -361,20 +364,20 @@ func (efc *EmptyFolderCleaner) deleteFolder(ctx context.Context, folder string)
return efc.filer.DeleteEntryMetaAndData(ctx, util.FullPath(folder), false, false, false, false, nil, 0)
}
func (efc *EmptyFolderCleaner) isDirectoryMarker(ctx context.Context, folder string) bool {
func (efc *EmptyFolderCleaner) isDirectoryMarker(ctx context.Context, folder string) (bool, bool) {
attrs, err := efc.filer.GetEntryAttributes(ctx, util.FullPath(folder))
if err != nil {
if errors.Is(err, filer_pb.ErrNotFound) {
return false
return false, true
}
glog.V(2).Infof("EmptyFolderCleaner: error reading attributes for %s, skipping deletion: %v", folder, err)
return true
glog.V(2).Infof("EmptyFolderCleaner: error reading attributes for %s, allowing deletion: %v", folder, err)
return false, false
}
if attrs == nil {
return false
return false, true
}
_, hasMime := attrs[s3_constants.ExtMimeType]
return hasMime
return hasMime, true
}
func (efc *EmptyFolderCleaner) getBucketCleanupPolicy(ctx context.Context, folder string) (bucketPath string, autoRemove bool, source string, attrValue string, err error) {