diff options
| author | chrislu <chris.lu@gmail.com> | 2022-03-07 00:04:59 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-03-07 00:04:59 -0800 |
| commit | bb0b7845449cfbd81c24dcded266ef861936fe5a (patch) | |
| tree | 8841e32dc3ba62c5c1200c543da43e51d8a0550b | |
| parent | b97a2cc08a82a04824d3ec338974f62a3220914a (diff) | |
| download | seaweedfs-bb0b7845449cfbd81c24dcded266ef861936fe5a.tar.xz seaweedfs-bb0b7845449cfbd81c24dcded266ef861936fe5a.zip | |
minor
| -rw-r--r-- | weed/server/filer_server_handlers_write_autochunk.go | 5 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write_upload.go | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index 778d0bff2..494a0f4bf 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -162,9 +162,10 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa var entry *filer.Entry var mergedChunks []*filer_pb.FileChunk + isAppend := isAppend(r) isOffsetWrite := len(fileChunks) > 0 && fileChunks[0].Offset > 0 // when it is an append - if isAppend(r) || isOffsetWrite { + if isAppend || isOffsetWrite { existingEntry, findErr := fs.filer.FindEntry(ctx, util.FullPath(path)) if findErr != nil && findErr != filer_pb.ErrNotFound { glog.V(0).Infof("failing to find %s: %v", path, findErr) @@ -175,7 +176,7 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa entry.Mtime = time.Now() entry.Md5 = nil // adjust chunk offsets - if isAppend(r) { + if isAppend { for _, chunk := range fileChunks { chunk.Offset += int64(entry.FileSize) } diff --git a/weed/server/filer_server_handlers_write_upload.go b/weed/server/filer_server_handlers_write_upload.go index f09581453..15a4bac33 100644 --- a/weed/server/filer_server_handlers_write_upload.go +++ b/weed/server/filer_server_handlers_write_upload.go @@ -32,6 +32,7 @@ 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 := isAppend(r) if query.Has("offset") { offset := query.Get("offset") offsetInt, err := strconv.ParseInt(offset, 10, 64) @@ -39,7 +40,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(r) && offsetInt > 0 { + if isAppend && offsetInt > 0 { err = fmt.Errorf("cannot set offset when op=append") return nil, nil, 0, err, nil } @@ -80,7 +81,7 @@ func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Reque bytesBufferLimitCond.Signal() break } - if chunkOffset == 0 && !isAppend(r) { + if chunkOffset == 0 && !isAppend { if dataSize < fs.option.SaveToFilerLimit || strings.HasPrefix(r.URL.Path, filer.DirectoryEtcRoot) { chunkOffset += dataSize smallContent = make([]byte, dataSize) |