diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-01-20 12:59:51 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-01-20 12:59:54 -0800 |
| commit | 1b8e3da295d1a5e8a09c0a65af3003583bca33ab (patch) | |
| tree | 4e94069ede067e9707207812b215f5cb6376cc58 | |
| parent | c78f3dddcbc28d22bacad8eb52c1fa6ef8e72215 (diff) | |
| download | seaweedfs-1b8e3da295d1a5e8a09c0a65af3003583bca33ab.tar.xz seaweedfs-1b8e3da295d1a5e8a09c0a65af3003583bca33ab.zip | |
refactoring
| -rw-r--r-- | weed/server/filer_server_handlers_write_autochunk.go | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index 43884bfde..2bd1104d3 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -96,12 +96,6 @@ func (fs *FilerServer) doPostAutoChunk(ctx context.Context, w http.ResponseWrite return nil, nil, err } - fileChunks, replyerr = filer.MaybeManifestize(fs.saveAsChunk(so), fileChunks) - if replyerr != nil { - glog.V(0).Infof("manifestize %s: %v", r.RequestURI, replyerr) - return - } - md5bytes = md5Hash.Sum(nil) filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent) @@ -121,12 +115,6 @@ func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter return nil, nil, err } - fileChunks, replyerr = filer.MaybeManifestize(fs.saveAsChunk(so), fileChunks) - if replyerr != nil { - glog.V(0).Infof("manifestize %s: %v", r.RequestURI, replyerr) - return - } - md5bytes = md5Hash.Sum(nil) filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent) @@ -135,6 +123,13 @@ func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileName string, contentType string, so *operation.StorageOption, md5bytes []byte, fileChunks []*filer_pb.FileChunk, chunkOffset int64, content []byte) (filerResult *FilerPostResult, replyerr error) { + // maybe compact chunks + fileChunks, replyerr = filer.MaybeManifestize(fs.saveAsChunk(so), fileChunks) + if replyerr != nil { + glog.V(0).Infof("manifestize %s: %v", r.RequestURI, replyerr) + return + } + // detect file mode modeStr := r.URL.Query().Get("mode") if modeStr == "" { |