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

protect locations slice

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/995
This commit is contained in:
Chris Lu
2019-06-28 09:47:29 -07:00
parent 327336ecf3
commit 9f3f2f7c79
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
weed/wdclient/vid_map.go
View File

@@ -37,12 +37,7 @@ func (vc *vidMap) LookupVolumeServerUrl(vid string) (serverUrl string, err error
return "", err return "", err
} }
locations := vc.GetLocations(uint32(id)) return vc.GetRandomLocation(uint32(id))
if len(locations) == 0 {
return "", fmt.Errorf("volume %d not found", id)
}
return locations[vc.r.Intn(len(locations))].Url, nil
} }
func (vc *vidMap) LookupFileId(fileId string) (fullUrl string, err error) { func (vc *vidMap) LookupFileId(fileId string) (fullUrl string, err error) {
@@ -85,6 +80,18 @@ func (vc *vidMap) GetLocations(vid uint32) (locations []Location) {
return vc.vid2Locations[vid] return vc.vid2Locations[vid]
} }
func (vc *vidMap) GetRandomLocation(vid uint32) (serverUrl string, err error) {
vc.RLock()
defer vc.RUnlock()
locations := vc.vid2Locations[vid]
if len(locations) == 0 {
return "", fmt.Errorf("volume %d not found", id)
}
return locations[vc.r.Intn(len(locations))].Url, nil
}
func (vc *vidMap) addLocation(vid uint32, location Location) { func (vc *vidMap) addLocation(vid uint32, location Location) {
vc.Lock() vc.Lock()
defer vc.Unlock() defer vc.Unlock()