|
|
@ -45,7 +45,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request) |
|
|
|
vid = fileId[0:commaSep] |
|
|
|
} |
|
|
|
} |
|
|
|
collection := r.FormValue("collection") //optional, but can be faster if too many collections
|
|
|
|
collection := r.FormValue("collection") // optional, but can be faster if too many collections
|
|
|
|
location := ms.findVolumeLocation(collection, vid) |
|
|
|
httpStatus := http.StatusOK |
|
|
|
if location.Error != "" || location.Locations == nil { |
|
|
@ -72,9 +72,6 @@ func (ms *MasterServer) findVolumeLocation(collection, vid string) operation.Loo |
|
|
|
for _, loc := range machines { |
|
|
|
locations = append(locations, operation.Location{Url: loc.Url(), PublicUrl: loc.PublicUrl}) |
|
|
|
} |
|
|
|
if locations == nil { |
|
|
|
err = fmt.Errorf("volume id %s not found", vid) |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
machines, getVidLocationsErr := ms.MasterClient.GetVidLocations(vid) |
|
|
@ -83,6 +80,9 @@ func (ms *MasterServer) findVolumeLocation(collection, vid string) operation.Loo |
|
|
|
} |
|
|
|
err = getVidLocationsErr |
|
|
|
} |
|
|
|
if len(locations) == 0 && err == nil { |
|
|
|
err = fmt.Errorf("volume id %s not found", vid) |
|
|
|
} |
|
|
|
ret := operation.LookupResult{ |
|
|
|
VolumeId: vid, |
|
|
|
Locations: locations, |
|
|
|