aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/filer_buckets.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/filer/filer_buckets.go')
-rw-r--r--weed/filer/filer_buckets.go106
1 files changed, 1 insertions, 105 deletions
diff --git a/weed/filer/filer_buckets.go b/weed/filer/filer_buckets.go
index 38a1abadb..e9cb3547e 100644
--- a/weed/filer/filer_buckets.go
+++ b/weed/filer/filer_buckets.go
@@ -1,76 +1,9 @@
package filer
import (
- "context"
- "math"
"strings"
- "sync"
-
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/util"
)
-type BucketName string
-type BucketOption struct {
- Name BucketName
- Replication string
- fsync bool
-}
-type FilerBuckets struct {
- dirBucketsPath string
- buckets map[BucketName]*BucketOption
- sync.RWMutex
-}
-
-func (f *Filer) LoadBuckets() {
-
- f.buckets = &FilerBuckets{
- buckets: make(map[BucketName]*BucketOption),
- }
-
- limit := int64(math.MaxInt32)
-
- entries, _, err := f.ListDirectoryEntries(context.Background(), util.FullPath(f.DirBucketsPath), "", false, limit, "", "", "")
-
- if err != nil {
- glog.V(1).Infof("no buckets found: %v", err)
- return
- }
-
- shouldFsyncMap := make(map[string]bool)
- for _, bucket := range f.FsyncBuckets {
- shouldFsyncMap[bucket] = true
- }
-
- glog.V(1).Infof("buckets found: %d", len(entries))
-
- f.buckets.Lock()
- for _, entry := range entries {
- _, shouldFsnyc := shouldFsyncMap[entry.Name()]
- f.buckets.buckets[BucketName(entry.Name())] = &BucketOption{
- Name: BucketName(entry.Name()),
- Replication: entry.Replication,
- fsync: shouldFsnyc,
- }
- }
- f.buckets.Unlock()
-
-}
-
-func (f *Filer) ReadBucketOption(buketName string) (replication string, fsync bool) {
-
- f.buckets.RLock()
- defer f.buckets.RUnlock()
-
- option, found := f.buckets.buckets[BucketName(buketName)]
-
- if !found {
- return "", false
- }
- return option.Replication, option.fsync
-
-}
-
func (f *Filer) isBucket(entry *Entry) bool {
if !entry.IsDirectory() {
return false
@@ -83,43 +16,6 @@ func (f *Filer) isBucket(entry *Entry) bool {
return false
}
- f.buckets.RLock()
- defer f.buckets.RUnlock()
-
- _, found := f.buckets.buckets[BucketName(dirName)]
-
- return found
-
-}
-
-func (f *Filer) maybeAddBucket(entry *Entry) {
- if !entry.IsDirectory() {
- return
- }
- parent, dirName := entry.FullPath.DirAndName()
- if parent != f.DirBucketsPath {
- return
- }
- f.addBucket(dirName, &BucketOption{
- Name: BucketName(dirName),
- Replication: entry.Replication,
- })
-}
-
-func (f *Filer) addBucket(buketName string, bucketOption *BucketOption) {
-
- f.buckets.Lock()
- defer f.buckets.Unlock()
-
- f.buckets.buckets[BucketName(buketName)] = bucketOption
-
-}
-
-func (f *Filer) deleteBucket(buketName string) {
-
- f.buckets.Lock()
- defer f.buckets.Unlock()
-
- delete(f.buckets.buckets, BucketName(buketName))
+ return true
}