Browse Source

fix dir/lookup and col/delete api

1, Fix Layouts first letter capitalized
2, Return http 204 when delete a collection

Signed-off-by: Lei Liu <lei01.liu@horizon.ai>
pull/1099/head
Lei Liu 5 years ago
parent
commit
1bcef02a6c
  1. 10
      weed/server/master_server_handlers_admin.go
  2. 2
      weed/topology/topology_map.go

10
weed/server/master_server_handlers_admin.go

@ -18,9 +18,10 @@ import (
)
func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) {
collection, ok := ms.Topo.FindCollection(r.FormValue("collection"))
collectionName := r.FormValue("collection")
collection, ok := ms.Topo.FindCollection(collectionName)
if !ok {
writeJsonError(w, r, http.StatusBadRequest, fmt.Errorf("collection %s does not exist", r.FormValue("collection")))
writeJsonError(w, r, http.StatusBadRequest, fmt.Errorf("collection %s does not exist", collectionName))
return
}
for _, server := range collection.ListVolumeServers() {
@ -35,7 +36,10 @@ func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.R
return
}
}
ms.Topo.DeleteCollection(r.FormValue("collection"))
ms.Topo.DeleteCollection(collectionName)
w.WriteHeader(http.StatusNoContent)
return
}
func (ms *MasterServer) dirStatusHandler(w http.ResponseWriter, r *http.Request) {

2
weed/topology/topology_map.go

@ -23,7 +23,7 @@ func (t *Topology) ToMap() interface{} {
}
}
}
m["layouts"] = layouts
m["Layouts"] = layouts
return m
}

Loading…
Cancel
Save