diff options
Diffstat (limited to 'weed/server/volume_server_handlers_write.go')
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index cd35255e5..eb24d1c07 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/weed/server/volume_server_handlers_write.go @@ -16,7 +16,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/topology" ) -func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { +func (vs *VolumeServer) OldPostHandler(w http.ResponseWriter, r *http.Request) { stats.VolumeServerRequestCounter.WithLabelValues("post").Inc() start := time.Now() @@ -26,7 +26,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { if e := r.ParseForm(); e != nil { glog.V(0).Infoln("form parse error:", e) - writeJsonError(w, r, http.StatusBadRequest, e) + oldWriteJsonError(w, r, http.StatusBadRequest, e) return } @@ -34,23 +34,23 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { volumeId, ve := needle.NewVolumeId(vid) if ve != nil { glog.V(0).Infoln("NewVolumeId error:", ve) - writeJsonError(w, r, http.StatusBadRequest, ve) + oldWriteJsonError(w, r, http.StatusBadRequest, ve) return } - if !vs.maybeCheckJwtAuthorization(r, vid, fid, true) { - writeJsonError(w, r, http.StatusUnauthorized, errors.New("wrong jwt")) + if !vs.oldMaybeCheckJwtAuthorization(r, vid, fid, true) { + oldWriteJsonError(w, r, http.StatusUnauthorized, errors.New("wrong jwt")) return } - needle, originalSize, ne := needle.CreateNeedleFromRequest(r, vs.FixJpgOrientation, vs.fileSizeLimitBytes) + needle, originalSize, ne := needle.OldCreateNeedleFromRequest(r, vs.FixJpgOrientation, vs.fileSizeLimitBytes) if ne != nil { - writeJsonError(w, r, http.StatusBadRequest, ne) + oldWriteJsonError(w, r, http.StatusBadRequest, ne) return } ret := operation.UploadResult{} - _, isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster(), vs.store, volumeId, needle, r) + _, isUnchanged, writeError := topology.OldReplicatedWrite(vs.GetMaster(), vs.store, volumeId, needle, r) // http 304 status code does not allow body if writeError == nil && isUnchanged { @@ -68,11 +68,11 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { } ret.Size = uint32(originalSize) ret.ETag = needle.Etag() - setEtag(w, ret.ETag) - writeJsonQuiet(w, r, httpStatus, ret) + oldSetEtag(w, ret.ETag) + oldWriteJsonQuiet(w, r, httpStatus, ret) } -func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { +func (vs *VolumeServer) OldDeleteHandler(w http.ResponseWriter, r *http.Request) { stats.VolumeServerRequestCounter.WithLabelValues("delete").Inc() start := time.Now() @@ -85,8 +85,8 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { volumeId, _ := needle.NewVolumeId(vid) n.ParsePath(fid) - if !vs.maybeCheckJwtAuthorization(r, vid, fid, true) { - writeJsonError(w, r, http.StatusUnauthorized, errors.New("wrong jwt")) + if !vs.oldMaybeCheckJwtAuthorization(r, vid, fid, true) { + oldWriteJsonError(w, r, http.StatusUnauthorized, errors.New("wrong jwt")) return } @@ -98,7 +98,7 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { if hasEcVolume { count, err := vs.store.DeleteEcShardNeedle(context.Background(), ecVolume, n, cookie) - writeDeleteResult(err, count, w, r) + oldWriteDeleteResult(err, count, w, r) return } @@ -106,13 +106,13 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { if ok != nil { m := make(map[string]uint32) m["size"] = 0 - writeJsonQuiet(w, r, http.StatusNotFound, m) + oldWriteJsonQuiet(w, r, http.StatusNotFound, m) return } if n.Cookie != cookie { glog.V(0).Infoln("delete", r.URL.Path, "with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent()) - writeJsonError(w, r, http.StatusBadRequest, errors.New("File Random Cookie does not match.")) + oldWriteJsonError(w, r, http.StatusBadRequest, errors.New("File Random Cookie does not match.")) return } @@ -121,12 +121,12 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { if n.IsChunkedManifest() { chunkManifest, e := operation.LoadChunkManifest(n.Data, n.IsGzipped()) if e != nil { - writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Load chunks manifest error: %v", e)) + oldWriteJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Load chunks manifest error: %v", e)) return } // make sure all chunks had deleted before delete manifest if e := chunkManifest.DeleteChunks(vs.GetMaster(), vs.grpcDialOption); e != nil { - writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Delete chunks error: %v", e)) + oldWriteJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Delete chunks error: %v", e)) return } count = chunkManifest.Size @@ -140,23 +140,23 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { } } - _, err := topology.ReplicatedDelete(vs.GetMaster(), vs.store, volumeId, n, r) + _, err := topology.OldReplicatedDelete(vs.GetMaster(), vs.store, volumeId, n, r) - writeDeleteResult(err, count, w, r) + oldWriteDeleteResult(err, count, w, r) } -func writeDeleteResult(err error, count int64, w http.ResponseWriter, r *http.Request) { +func oldWriteDeleteResult(err error, count int64, w http.ResponseWriter, r *http.Request) { if err == nil { m := make(map[string]int64) m["size"] = count - writeJsonQuiet(w, r, http.StatusAccepted, m) + oldWriteJsonQuiet(w, r, http.StatusAccepted, m) } else { - writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Deletion Failed: %v", err)) + oldWriteJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("Deletion Failed: %v", err)) } } -func setEtag(w http.ResponseWriter, etag string) { +func oldSetEtag(w http.ResponseWriter, etag string) { if etag != "" { if strings.HasPrefix(etag, "\"") { w.Header().Set("ETag", etag) |