aboutsummaryrefslogtreecommitdiff
path: root/go/weed/volume.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2013-11-12 02:21:22 -0800
committerChris Lu <chris.lu@gmail.com>2013-11-12 02:21:22 -0800
commit3b687111399fd08468e4a6232bcbe6068df961bf (patch)
treecde07f3ba6c9ae411d55b25c331bca6827253c30 /go/weed/volume.go
parent8f0e2f31afad1fcb2f06ef3ae55866313b7b4b02 (diff)
downloadseaweedfs-3b687111399fd08468e4a6232bcbe6068df961bf.tar.xz
seaweedfs-3b687111399fd08468e4a6232bcbe6068df961bf.zip
support for collections!
Diffstat (limited to 'go/weed/volume.go')
-rw-r--r--go/weed/volume.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/go/weed/volume.go b/go/weed/volume.go
index cf58af799..87d42e227 100644
--- a/go/weed/volume.go
+++ b/go/weed/volume.go
@@ -56,13 +56,13 @@ func statusHandler(w http.ResponseWriter, r *http.Request) {
writeJsonQuiet(w, r, m)
}
func assignVolumeHandler(w http.ResponseWriter, r *http.Request) {
- err := store.AddVolume(r.FormValue("volume"), r.FormValue("replicationType"))
+ err := store.AddVolume(r.FormValue("volume"), r.FormValue("collection"), r.FormValue("replicationType"))
if err == nil {
writeJsonQuiet(w, r, map[string]string{"error": ""})
} else {
writeJsonQuiet(w, r, map[string]string{"error": err.Error()})
}
- debug("assign volume =", r.FormValue("volume"), ", replicationType =", r.FormValue("replicationType"), ", error =", err)
+ debug("assign volume =", r.FormValue("volume"), ", collection =", r.FormValue("collection"), ", replicationType =", r.FormValue("replicationType"), ", error =", err)
}
func vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) {
err, ret := store.CheckCompactVolume(r.FormValue("volume"), r.FormValue("garbageThreshold"))
@@ -112,6 +112,8 @@ func storeHandler(w http.ResponseWriter, r *http.Request) {
GetOrHeadHandler(w, r, false)
case "DELETE":
secure(volumeWhiteList, DeleteHandler)(w, r)
+ case "PUT":
+ secure(volumeWhiteList, PostHandler)(w, r)
case "POST":
secure(volumeWhiteList, PostHandler)(w, r)
}