diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-05-13 03:54:15 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-05-13 03:54:15 -0700 |
| commit | 3fbf6353086214d4e4fc3b29df34d0fa24e578da (patch) | |
| tree | c2b75652163880f90622f0bf706a0df631ef4b4b | |
| parent | ca4017dd87ce23198e4589b7cf631ad6276ea564 (diff) | |
| parent | 3a5e4769cfe383ca5a3e3d4078b5e80120763f3b (diff) | |
| download | seaweedfs-3fbf6353086214d4e4fc3b29df34d0fa24e578da.tar.xz seaweedfs-3fbf6353086214d4e4fc3b29df34d0fa24e578da.zip | |
Merge branch 'master' into msg_channel
| -rw-r--r-- | weed/server/master_server_handlers.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index 514d86800..ebcb7efd2 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -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, |