diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-01 12:28:08 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-01 12:28:08 -0700 |
| commit | 89933c46d224008cf53cd16e1bf2d04188d7bb1a (patch) | |
| tree | 88ae4e886df0176c3539f673de2c0c346a52ff31 | |
| parent | 1c7e404abec01da8bb322ef4000d6acecf1a6be5 (diff) | |
| download | seaweedfs-89933c46d224008cf53cd16e1bf2d04188d7bb1a.tar.xz seaweedfs-89933c46d224008cf53cd16e1bf2d04188d7bb1a.zip | |
s3: skip hidden directories in /buckets folder
| -rw-r--r-- | weed/filer/filer_buckets.go | 4 | ||||
| -rw-r--r-- | weed/filer/filer_on_meta_event.go | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/weed/filer/filer_buckets.go b/weed/filer/filer_buckets.go index 43fb000c9..38a1abadb 100644 --- a/weed/filer/filer_buckets.go +++ b/weed/filer/filer_buckets.go @@ -3,6 +3,7 @@ package filer import ( "context" "math" + "strings" "sync" "github.com/chrislusf/seaweedfs/weed/glog" @@ -78,6 +79,9 @@ func (f *Filer) isBucket(entry *Entry) bool { if parent != f.DirBucketsPath { return false } + if strings.HasPrefix(dirName, ".") { + return false + } f.buckets.RLock() defer f.buckets.RUnlock() diff --git a/weed/filer/filer_on_meta_event.go b/weed/filer/filer_on_meta_event.go index c9f75a5ca..5717b2b09 100644 --- a/weed/filer/filer_on_meta_event.go +++ b/weed/filer/filer_on_meta_event.go @@ -24,10 +24,14 @@ func (f *Filer) onBucketEvents(event *filer_pb.SubscribeMetadataResponse) { } if f.DirBucketsPath == event.Directory { if message.OldEntry == nil && message.NewEntry != nil { - f.Store.OnBucketCreation(message.NewEntry.Name) + if message.NewEntry.IsDirectory { + f.Store.OnBucketCreation(message.NewEntry.Name) + } } if message.OldEntry != nil && message.NewEntry == nil { - f.Store.OnBucketDeletion(message.OldEntry.Name) + if message.OldEntry.IsDirectory { + f.Store.OnBucketDeletion(message.OldEntry.Name) + } } } } |
