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

Preserve explicit directory markers with octet-stream MIME (#8726)

Browse Source 
* Preserve octet-stream MIME on explicit directory markers

* Run empty directory marker regression in CI

* Run S3 Spark workflow for filer changes
This commit is contained in:
Chris Lu
2026-03-21 19:31:56 -07:00
committed by GitHub
parent 7f0cf72574
commit d6a872c4b9
5 changed files with 127 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
weed/filer/filerstore_wrapper.go
View File

@@ -128,9 +128,7 @@ func (fsw *FilerStoreWrapper) InsertEntry(ctx context.Context, entry *Entry) err
}()
filer_pb.BeforeEntrySerialization(entry.GetChunks())
if entry.Mime == "application/octet-stream" {
entry.Mime = ""
}
normalizeEntryMimeForStore(entry)
if err := fsw.handleUpdateToHardLinks(ctx, entry); err != nil {
return err
@@ -150,9 +148,7 @@ func (fsw *FilerStoreWrapper) UpdateEntry(ctx context.Context, entry *Entry) err
}()
filer_pb.BeforeEntrySerialization(entry.GetChunks())
if entry.Mime == "application/octet-stream" {
entry.Mime = ""
}
normalizeEntryMimeForStore(entry)
if err := fsw.handleUpdateToHardLinks(ctx, entry); err != nil {
return err
@@ -162,6 +158,15 @@ func (fsw *FilerStoreWrapper) UpdateEntry(ctx context.Context, entry *Entry) err
return actualStore.UpdateEntry(ctx, entry)
}
func normalizeEntryMimeForStore(entry *Entry) {
if entry == nil {
return
}
if !entry.IsDirectory() && entry.Mime == "application/octet-stream" {
entry.Mime = ""
}
}
func (fsw *FilerStoreWrapper) FindEntry(ctx context.Context, fp util.FullPath) (entry *Entry, err error) {
ctx = context.WithoutCancel(ctx)
actualStore := fsw.getActualStore(fp)