gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1099 from iliul/enhanced-api-logic

Browse source 
enhanced master api logic
This commit is contained in:
Chris Lu 2019-10-31 08:58:45 -07:00 committed by GitHub
parent 8479452934 1294999d8b
commit 08c83b1a59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed/server/master_server_handlers_admin.go
View file

@ -18,9 +18,10 @@ import (
) )
func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) { 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 { 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 return
} }
for _, server := range collection.ListVolumeServers() { for _, server := range collection.ListVolumeServers() {
@ -35,7 +36,10 @@ func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.R
return 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) { func (ms *MasterServer) dirStatusHandler(w http.ResponseWriter, r *http.Request) {
@ -53,6 +57,7 @@ func (ms *MasterServer) volumeVacuumHandler(w http.ResponseWriter, r *http.Reque
gcThreshold, err = strconv.ParseFloat(gcString, 32) gcThreshold, err = strconv.ParseFloat(gcString, 32)
if err != nil { if err != nil {
glog.V(0).Infof("garbageThreshold %s is not a valid float number: %v", gcString, err) glog.V(0).Infof("garbageThreshold %s is not a valid float number: %v", gcString, err)
writeJsonError(w, r, http.StatusNotAcceptable, fmt.Errorf("garbageThreshold %s is not a valid float number", gcString))
return return
} }
} }

2
weed/topology/topology_map.go
View file

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