diff options
| author | Lei Liu <lei01.liu@horizon.ai> | 2019-10-31 14:25:05 +0800 |
|---|---|---|
| committer | Lei Liu <lei01.liu@horizon.ai> | 2019-10-31 16:55:45 +0800 |
| commit | 1bcef02a6c730d7d8287e03c5226a61ff6e220a3 (patch) | |
| tree | adec74dc69708ec9aa64b8b094ccc0ff09298eca | |
| parent | 8479452934bb54441d0a6cf52ad64b7099bcdc6d (diff) | |
| download | seaweedfs-1bcef02a6c730d7d8287e03c5226a61ff6e220a3.tar.xz seaweedfs-1bcef02a6c730d7d8287e03c5226a61ff6e220a3.zip | |
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>
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 10 | ||||
| -rw-r--r-- | weed/topology/topology_map.go | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index 486bf31f4..42ec50dd5 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/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) { diff --git a/weed/topology/topology_map.go b/weed/topology/topology_map.go index 37a88c9ed..0ad30f12e 100644 --- a/weed/topology/topology_map.go +++ b/weed/topology/topology_map.go @@ -23,7 +23,7 @@ func (t *Topology) ToMap() interface{} { } } } - m["layouts"] = layouts + m["Layouts"] = layouts return m } |
