gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

fix init error

Browse source
This commit is contained in:
Chris Lu 2018-07-28 18:40:31 -07:00
parent cfbfc7cb67
commit 7214a8e265
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
weed/wdclient/masterclient.go
View file

@ -16,7 +16,7 @@ type MasterClient struct {
currentMaster string
masters []string
VidMap
vidMap
}
func NewMasterClient(ctx context.Context, clientName string, masters []string) *MasterClient {
@ -24,6 +24,7 @@ func NewMasterClient(ctx context.Context, clientName string, masters []string) *
ctx: ctx,
name: clientName,
masters: masters,
vidMap: newVidMap(),
}
}

18
weed/wdclient/vid_map.go
View file

@ -15,12 +15,18 @@ type Location struct {
PublicUrl string `json:"publicUrl,omitempty"`
}
type VidMap struct {
type vidMap struct {
sync.RWMutex
vid2Locations map[uint32][]Location
}
func (vc *VidMap) LookupVolumeServerUrl(vid string) (serverUrl string, err error) {
func newVidMap() vidMap {
return vidMap{
vid2Locations: make(map[uint32][]Location),
}
}
func (vc *vidMap) LookupVolumeServerUrl(vid string) (serverUrl string, err error) {
id, err := strconv.Atoi(vid)
if err != nil {
glog.V(1).Infof("Unknown volume id %s", vid)
@ -35,7 +41,7 @@ func (vc *VidMap) LookupVolumeServerUrl(vid string) (serverUrl string, err error
return locations[rand.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) {
parts := strings.Split(fileId, ",")
if len(parts) != 2 {
return "", errors.New("Invalid fileId " + fileId)
@ -47,14 +53,14 @@ func (vc *VidMap) LookupFileId(fileId string) (fullUrl string, err error) {
return "http://" + serverUrl + "/" + fileId, nil
}
func (vc *VidMap) GetLocations(vid uint32) (locations []Location) {
func (vc *vidMap) GetLocations(vid uint32) (locations []Location) {
vc.RLock()
defer vc.RUnlock()
return vc.vid2Locations[vid]
}
func (vc *VidMap) addLocation(vid uint32, location Location) {
func (vc *vidMap) addLocation(vid uint32, location Location) {
vc.Lock()
defer vc.Unlock()
@ -74,7 +80,7 @@ func (vc *VidMap) addLocation(vid uint32, location Location) {
}
func (vc *VidMap) deleteLocation(vid uint32, location Location) {
func (vc *vidMap) deleteLocation(vid uint32, location Location) {
vc.Lock()
defer vc.Unlock()