aboutsummaryrefslogtreecommitdiff
path: root/weed/server/filer_server_handlers_write_upload.go
diff options
context:
space:
mode:
authorbanjiaojuhao <banjiaojuhao@qq.com>2022-03-07 15:41:07 +0800
committerbanjiaojuhao <banjiaojuhao@qq.com>2022-03-07 15:41:07 +0800
commit71f30468410a10ac7ed80386e45efb3aafa9da1b (patch)
treeff94bb79f6f554cb2697d6fd321ee82be3a69d1f /weed/server/filer_server_handlers_write_upload.go
parent0ba4e4cd23cc50759e5d5a0bd74e177ed7f80070 (diff)
downloadseaweedfs-71f30468410a10ac7ed80386e45efb3aafa9da1b.tar.xz
seaweedfs-71f30468410a10ac7ed80386e45efb3aafa9da1b.zip
filer: add back isAppend function
Diffstat (limited to 'weed/server/filer_server_handlers_write_upload.go')
-rw-r--r--weed/server/filer_server_handlers_write_upload.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/weed/server/filer_server_handlers_write_upload.go b/weed/server/filer_server_handlers_write_upload.go
index 294a97582..f09581453 100644
--- a/weed/server/filer_server_handlers_write_upload.go
+++ b/weed/server/filer_server_handlers_write_upload.go
@@ -31,7 +31,6 @@ var bufPool = sync.Pool{
func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Request, reader io.Reader, chunkSize int32, fileName, contentType string, contentLength int64, so *operation.StorageOption) (fileChunks []*filer_pb.FileChunk, md5Hash hash.Hash, chunkOffset int64, uploadErr error, smallContent []byte) {
query := r.URL.Query()
- isAppend := query.Get("op") == "append"
if query.Has("offset") {
offset := query.Get("offset")
@@ -40,7 +39,7 @@ func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Reque
err = fmt.Errorf("invalid 'offset': '%s'", offset)
return nil, nil, 0, err, nil
}
- if isAppend && offsetInt > 0 {
+ if isAppend(r) && offsetInt > 0 {
err = fmt.Errorf("cannot set offset when op=append")
return nil, nil, 0, err, nil
}
@@ -81,7 +80,7 @@ func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Reque
bytesBufferLimitCond.Signal()
break
}
- if chunkOffset == 0 && !isAppend {
+ if chunkOffset == 0 && !isAppend(r) {
if dataSize < fs.option.SaveToFilerLimit || strings.HasPrefix(r.URL.Path, filer.DirectoryEtcRoot) {
chunkOffset += dataSize
smallContent = make([]byte, dataSize)