diff options
Diffstat (limited to 'weed/storage/store.go')
| -rw-r--r-- | weed/storage/store.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/weed/storage/store.go b/weed/storage/store.go index 8f3b763fc..2a92ae934 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -138,10 +138,10 @@ func (s *Store) findVolume(vid needle.VolumeId) *Volume { } return nil } -func (s *Store) FindFreeLocation(diskType DiskType) (ret *DiskLocation) { +func (s *Store) FindFreeLocation(filterFn func(location *DiskLocation) bool) (ret *DiskLocation) { max := int32(0) for _, location := range s.Locations { - if diskType != location.DiskType { + if filterFn != nil && !filterFn(location) { continue } if location.isDiskSpaceLow { @@ -162,7 +162,9 @@ func (s *Store) addVolume(vid needle.VolumeId, collection string, needleMapKind if s.findVolume(vid) != nil { return fmt.Errorf("Volume Id %d already exists!", vid) } - if location := s.FindFreeLocation(diskType); location != nil { + if location := s.FindFreeLocation(func(location *DiskLocation) bool { + return location.DiskType == diskType + }); location != nil { glog.V(0).Infof("In dir %s adds volume:%v collection:%s replicaPlacement:%v ttl:%v", location.Directory, vid, collection, replicaPlacement, ttl) if volume, err := NewVolume(location.Directory, location.IdxDirectory, collection, vid, needleMapKind, replicaPlacement, ttl, preallocate, memoryMapMaxSizeMb, ldbTimeout); err == nil { |