diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-12-22 13:11:07 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-12-22 13:11:07 -0800 |
| commit | be946c9e54db3297a68715d1789598d004b71e60 (patch) | |
| tree | 9dc1df0c6a75d697799e67ecc9f999e8848fdb53 /weed/server | |
| parent | 141d302492ba73ca5b20ee0ee98da9ca061efa42 (diff) | |
| download | seaweedfs-be946c9e54db3297a68715d1789598d004b71e60.tar.xz seaweedfs-be946c9e54db3297a68715d1789598d004b71e60.zip | |
filer store original data size instead of data size after gzip
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/common.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 032b975ef..d88abfdc8 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -91,7 +91,7 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st } debug("parsing upload file...") - fname, data, mimeType, pairMap, isGzipped, lastModified, _, _, pe := storage.ParseUpload(r) + fname, data, mimeType, pairMap, isGzipped, originalDataSize, lastModified, _, _, pe := storage.ParseUpload(r) if pe != nil { writeJsonError(w, r, http.StatusBadRequest, pe) return @@ -134,7 +134,7 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st m["fileName"] = fname m["fid"] = assignResult.Fid m["fileUrl"] = assignResult.PublicUrl + "/" + assignResult.Fid - m["size"] = uploadResult.Size + m["size"] = originalDataSize m["eTag"] = uploadResult.ETag writeJsonQuiet(w, r, http.StatusCreated, m) return diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index f1a7dd930..1fc5b1319 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/weed/server/volume_server_handlers_write.go @@ -27,7 +27,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { writeJsonError(w, r, http.StatusBadRequest, ve) return } - needle, ne := storage.NewNeedle(r, vs.FixJpgOrientation) + needle, originalSize, ne := storage.CreateNeedleFromRequest(r, vs.FixJpgOrientation) if ne != nil { writeJsonError(w, r, http.StatusBadRequest, ne) return @@ -44,7 +44,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { if needle.HasName() { ret.Name = string(needle.Name) } - ret.Size = needle.DataSize + ret.Size = uint32(originalSize) setEtag(w, needle.Etag()) writeJsonQuiet(w, r, httpStatus, ret) } |