From db1ac7b3ebac5a9b71ad829465765d628b8a0197 Mon Sep 17 00:00:00 2001 From: yangrun Date: Mon, 23 May 2016 18:21:38 +0800 Subject: [PATCH] master: redirect handler accept collection parameter --- go/weed/weed_server/master_server_handlers_admin.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 2b6ca0320..383456356 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -121,7 +121,8 @@ func (ms *MasterServer) redirectHandler(w http.ResponseWriter, r *http.Request) debug("parsing error:", err, r.URL.Path) return } - machines := ms.Topo.Lookup("", volumeId) + collection := r.FormValue("collection") + machines := ms.Topo.Lookup(collection, volumeId) if machines != nil && len(machines) > 0 { var url string if r.URL.RawQuery != "" { @@ -131,7 +132,7 @@ func (ms *MasterServer) redirectHandler(w http.ResponseWriter, r *http.Request) } http.Redirect(w, r, url, http.StatusMovedPermanently) } else { - writeJsonError(w, r, http.StatusNotFound, fmt.Errorf("volume id %d not found", volumeId)) + writeJsonError(w, r, http.StatusNotFound, fmt.Errorf("volume id %d or collection %s not found", volumeId, collection)) } }