mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-07-18 15:06:54 +02:00
Code Issues Projects Releases Wiki Activity

fix compilation error

Browse source
This commit is contained in:
Chris Lu 2018-07-28 18:34:15 -07:00
parent 4e0522a80c
commit cfbfc7cb67
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/operation/delete_content.go
View file

@ -22,7 +22,7 @@ type DeleteResult struct {
} }
func DeleteFromVolumeServer(fileUrlOnVolume string, jwt security.EncodedJwt) error { func DeleteFromVolumeServer(fileUrlOnVolume string, jwt security.EncodedJwt) error {
err = util.Delete(fileUrlOnVolume, jwt) err := util.Delete(fileUrlOnVolume, jwt)
if err != nil { if err != nil {
return fmt.Errorf("Failed to delete %s:%v", fileUrlOnVolume, err) return fmt.Errorf("Failed to delete %s:%v", fileUrlOnVolume, err)
} }

4
weed/wdclient/masterclient.go
View file

@ -68,10 +68,10 @@ func (mc *MasterClient) tryAllMasters() {
PublicUrl: volumeLocation.PublicUrl, PublicUrl: volumeLocation.PublicUrl,
} }
for _, newVid := range volumeLocation.NewVids { for _, newVid := range volumeLocation.NewVids {
mc.AddLocation(newVid, loc) mc.addLocation(newVid, loc)
} }
for _, deletedVid := range volumeLocation.DeletedVids { for _, deletedVid := range volumeLocation.DeletedVids {
mc.DeleteLocation(deletedVid, loc) mc.deleteLocation(deletedVid, loc)
} }
} }
} }

6
weed/wdclient/vid_map.go
View file

@ -40,7 +40,7 @@ func (vc *VidMap) LookupFileId(fileId string) (fullUrl string, err error) {
if len(parts) != 2 { if len(parts) != 2 {
return "", errors.New("Invalid fileId " + fileId) return "", errors.New("Invalid fileId " + fileId)
} }
serverUrl, lookupError := LookupVolumeServerUrl(parts[0]) serverUrl, lookupError := vc.LookupVolumeServerUrl(parts[0])
if lookupError != nil { if lookupError != nil {
return "", lookupError return "", lookupError
} }
@ -54,7 +54,7 @@ func (vc *VidMap) GetLocations(vid uint32) (locations []Location) {
return vc.vid2Locations[vid] return vc.vid2Locations[vid]
} }
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()
@ -74,7 +74,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() vc.Lock()
defer vc.Unlock() defer vc.Unlock()