gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "rename: delete source entry metadata only, skipping hard links"

Browse Source 
This reverts commit 03466f955e.

fix https://github.com/seaweedfs/seaweedfs/issues/3386
This commit is contained in:
chrislu
2022-07-31 22:51:41 -07:00
parent 5fbe437ee9
commit 303bd067b5
5 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/filer/filer_delete_entry.go
View File

@@ -122,11 +122,7 @@ func (f *Filer) doDeleteEntryMetaAndData(ctx context.Context, entry *Entry, shou
glog.V(3).Infof("deleting entry %v, delete chunks: %v", entry.FullPath, shouldDeleteChunks)
if !entry.IsDirectory() && !shouldDeleteChunks {
if storeDeletionErr := f.Store.DeleteOneEntrySkipHardlink(ctx, entry.FullPath); storeDeletionErr != nil {
return fmt.Errorf("filer store delete skip hardlink: %v", storeDeletionErr)
}
} else if storeDeletionErr := f.Store.DeleteOneEntry(ctx, entry); storeDeletionErr != nil {
if storeDeletionErr := f.Store.DeleteOneEntry(ctx, entry); storeDeletionErr != nil {
return fmt.Errorf("filer store delete: %v", storeDeletionErr)
}
if !entry.IsDirectory() {