diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2021-02-18 14:05:51 +0800 |
|---|---|---|
| committer | bingoohuang <bingoo.huang@gmail.com> | 2021-02-18 14:05:51 +0800 |
| commit | 352ac2f2712177d6a9c8220bab73823ff6748581 (patch) | |
| tree | 88b5976b0e9382883ba21a20098c319a8787c002 /weed/server/common.go | |
| parent | eab6e31d34bb22beeb1ca416596c44b1590075c0 (diff) | |
| parent | c8f56f5712c1efffc46de95a8057ed09c21da2db (diff) | |
| download | seaweedfs-352ac2f2712177d6a9c8220bab73823ff6748581.tar.xz seaweedfs-352ac2f2712177d6a9c8220bab73823ff6748581.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'weed/server/common.go')
| -rw-r--r-- | weed/server/common.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index cf9547950..9001a3b33 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -100,7 +100,7 @@ func debug(params ...interface{}) { glog.V(4).Infoln(params...) } -func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl string, grpcDialOption grpc.DialOption) { +func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterFn operation.GetMasterFn, grpcDialOption grpc.DialOption) { m := make(map[string]interface{}) if r.Method != "POST" { writeJsonError(w, r, http.StatusMethodNotAllowed, errors.New("Only submit via POST!")) @@ -131,8 +131,9 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st Replication: r.FormValue("replication"), Collection: r.FormValue("collection"), Ttl: r.FormValue("ttl"), + DiskType: r.FormValue("disk"), } - assignResult, ae := operation.Assign(masterUrl, grpcDialOption, ar) + assignResult, ae := operation.Assign(masterFn, grpcDialOption, ar) if ae != nil { writeJsonError(w, r, http.StatusInternalServerError, ae) return |