mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-19 21:10:48 +02:00
* fix(mount): remove fid pool to stop master over-allocating volumes
The writeback-cache fid pool pre-allocated file IDs with
ExpectedDataSize = ChunkSizeLimit (typically 8+ MB). The master's
PickForWrite charges count * expectedDataSize against the volume's
effectiveSize, so a full pool refill could charge hundreds of MB
against a single volume before any bytes were actually written.
That tripped RecordAssign's hard-limit path and eagerly removed
volumes from writable, causing the master to grow new volumes
even when the real data being written was tiny.
Drop the pool entirely. Every chunk upload goes through
UploadWithRetry -> AssignVolume with no ExpectedDataSize hint,
letting the master fall back to the 1 MB default estimate. The
mount->filer grpc connection is already cached in pb.WithGrpcClient
(non-streaming mode), so per-chunk AssignVolume is a unary RPC
over an existing HTTP/2 stream, not a full dial. Path-based
filer.conf storage rules now apply to mount chunk assigns again,
which the pool had to skip.
Also remove the now-unused operation.UploadWithAssignFunc and its
AssignFunc type.
* fix(upload): populate ExpectedDataSize from actual chunk bytes
UploadWithRetry already buffers the full chunk into `data` before
calling AssignVolume, so the real size is known. Previously the
assign request went out with ExpectedDataSize=0, making the master
fall back to the 1 MB DefaultNeedleSizeEstimate per fid — same
over-reservation symptom the pool had, just smaller per call.
Stamp ExpectedDataSize = len(data) before the assign RPC when the
caller hasn't already set it. This covers mount chunk uploads,
filer_copy, filersink, mq/logstore, broker_write, gateway_upload,
and nfs — all the UploadWithRetry paths.
* fix(assign): pass real ExpectedDataSize at every assign call site
After removing the mount fid pool, per-chunk AssignVolume calls went
out with ExpectedDataSize=0, making the master fall back to its 1 MB
DefaultNeedleSizeEstimate. That's still an over-estimate for small
writes. Thread the real payload size through every remaining assign
site so RecordAssign charges effectiveSize accurately and stops
prematurely marking volumes full.
- filer: assignNewFileInfo now takes expectedDataSize and stamps it
on both primary and alternate VolumeAssignRequests. Callers pass:
- SSE data-to-chunk: len(data)
- copy manifest save: len(data)
- streamCopyChunk: srcChunk.Size
- TUS sub-chunk: bytes read
- saveAsChunk (autochunk/manifestize): 0 (small, size unknown
until the reader is drained; master uses 1 MB default)
- filer gRPC remote fetch-and-write: ExpectedDataSize = chunkSize
after the adaptive chunkSize is computed.
- ChunkedUploadOption.AssignFunc gains an expectedDataSize parameter;
upload_chunked.go passes the buffered dataSize at the call site.
S3 PUT assignFunc stamps it on the AssignVolumeRequest.
- S3 copy: assignNewVolume / prepareChunkCopy take expectedDataSize;
all seven call sites pass the source chunk's Size.
- operation.SubmitFiles / FilePart.Upload: derive per-fid size from
FileSize (average for batched requests, real per-chunk size for
sequential chunk assigns).
- benchmark: pass fileSize.
- filer append-to-file: pass len(data).
* fix(assign): thread size through SaveDataAsChunkFunctionType
The saveAsChunk path (autochunk, filer_copy, webdav, mount) ran
AssignVolume before the reader was drained, so it had to pass
ExpectedDataSize=0 and fall back to the master's 1 MB default.
Add an expectedDataSize parameter to SaveDataAsChunkFunctionType.
- mergeIntoManifest already has the serialized manifest bytes, so
it passes uint64(len(data)) directly.
- Mount's saveDataAsChunk ignores the parameter because it uses
UploadWithRetry, which already stamps len(data) on the assign
after reading the payload.
- webdav and filer_copy saveDataAsChunk follow the same UploadWithRetry
path and also ignore the hint.
- Filer's saveAsChunk (used for manifestize) plumbs the value to
assignNewFileInfo so manifest-chunk assigns get a real size.
Callers of saveFunc-as-value (weedfs_file_sync, dirty_pages_chunked)
pass the chunk size they're about to upload.
447 lines
13 KiB
Go
447 lines
13 KiB
Go
package weed_server
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"os"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/operation"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/constants"
|
|
)
|
|
|
|
func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, contentLength int64, so *operation.StorageOption) {
|
|
|
|
// autoChunking can be set at the command-line level or as a query param. Query param overrides command-line
|
|
query := r.URL.Query()
|
|
|
|
parsedMaxMB, _ := strconv.ParseInt(query.Get("maxMB"), 10, 32)
|
|
maxMB := int32(parsedMaxMB)
|
|
if maxMB <= 0 && fs.option.MaxMB > 0 {
|
|
maxMB = int32(fs.option.MaxMB)
|
|
}
|
|
|
|
chunkSize := 1024 * 1024 * maxMB
|
|
|
|
var reply *FilerPostResult
|
|
var err error
|
|
var md5bytes []byte
|
|
if r.Method == http.MethodPost {
|
|
if r.Header.Get("Content-Type") == "" && strings.HasSuffix(r.URL.Path, "/") {
|
|
reply, err = fs.mkdir(ctx, w, r, so)
|
|
} else {
|
|
reply, md5bytes, err = fs.doPostAutoChunk(ctx, w, r, chunkSize, contentLength, so)
|
|
}
|
|
} else {
|
|
reply, md5bytes, err = fs.doPutAutoChunk(ctx, w, r, chunkSize, contentLength, so)
|
|
}
|
|
if err != nil {
|
|
errStr := err.Error()
|
|
switch {
|
|
case errStr == constants.ErrMsgOperationNotPermitted:
|
|
writeJsonError(w, r, http.StatusForbidden, err)
|
|
case strings.HasPrefix(errStr, "read input:") || errStr == io.ErrUnexpectedEOF.Error():
|
|
writeJsonError(w, r, util.HttpStatusCancelled, err)
|
|
case strings.HasSuffix(errStr, "is a file") || strings.HasSuffix(errStr, "already exists"):
|
|
writeJsonError(w, r, http.StatusConflict, err)
|
|
case errStr == constants.ErrMsgBadDigest:
|
|
writeJsonError(w, r, http.StatusBadRequest, err)
|
|
default:
|
|
writeJsonError(w, r, http.StatusInternalServerError, err)
|
|
}
|
|
} else if reply != nil {
|
|
if len(md5bytes) > 0 {
|
|
md5InBase64 := util.Base64Encode(md5bytes)
|
|
w.Header().Set("Content-MD5", md5InBase64)
|
|
}
|
|
writeJsonQuiet(w, r, http.StatusCreated, reply)
|
|
}
|
|
}
|
|
|
|
func (fs *FilerServer) doPostAutoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, chunkSize int32, contentLength int64, so *operation.StorageOption) (filerResult *FilerPostResult, md5bytes []byte, replyerr error) {
|
|
multipartReader, multipartReaderErr := r.MultipartReader()
|
|
if multipartReaderErr != nil {
|
|
return nil, nil, multipartReaderErr
|
|
}
|
|
|
|
part1, part1Err := multipartReader.NextPart()
|
|
if part1Err != nil {
|
|
return nil, nil, part1Err
|
|
}
|
|
|
|
fileName := part1.FileName()
|
|
if fileName != "" {
|
|
fileName = path.Base(fileName)
|
|
}
|
|
contentType := part1.Header.Get("Content-Type")
|
|
if contentType == "application/octet-stream" {
|
|
contentType = ""
|
|
}
|
|
|
|
if err := fs.checkPermissions(ctx, r, fileName); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
if so.SaveInside {
|
|
buf := bufPool.Get().(*bytes.Buffer)
|
|
buf.Reset()
|
|
buf.ReadFrom(part1)
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, nil, nil, 0, buf.Bytes())
|
|
bufPool.Put(buf)
|
|
return
|
|
}
|
|
|
|
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, part1, chunkSize, fileName, contentType, contentLength, so)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
md5bytes = md5Hash.Sum(nil)
|
|
headerMd5 := r.Header.Get("Content-Md5")
|
|
if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
return nil, nil, errors.New(constants.ErrMsgBadDigest)
|
|
}
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent)
|
|
if replyerr != nil {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter, r *http.Request, chunkSize int32, contentLength int64, so *operation.StorageOption) (filerResult *FilerPostResult, md5bytes []byte, replyerr error) {
|
|
|
|
fileName := path.Base(r.URL.Path)
|
|
contentType := r.Header.Get("Content-Type")
|
|
if contentType == "application/octet-stream" {
|
|
contentType = ""
|
|
}
|
|
|
|
if err := fs.checkPermissions(ctx, r, fileName); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, r.Body, chunkSize, fileName, contentType, contentLength, so)
|
|
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
md5bytes = md5Hash.Sum(nil)
|
|
headerMd5 := r.Header.Get("Content-Md5")
|
|
if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
return nil, nil, errors.New(constants.ErrMsgBadDigest)
|
|
}
|
|
filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent)
|
|
if replyerr != nil {
|
|
fs.filer.DeleteUncommittedChunks(ctx, fileChunks)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func isAppend(r *http.Request) bool {
|
|
return r.URL.Query().Get("op") == "append"
|
|
}
|
|
|
|
func skipCheckParentDirEntry(r *http.Request) bool {
|
|
return r.URL.Query().Get("skipCheckParentDir") == "true"
|
|
}
|
|
|
|
func (fs *FilerServer) checkPermissions(ctx context.Context, r *http.Request, fileName string) error {
|
|
fullPath := fs.fixFilePath(ctx, r, fileName)
|
|
enforced, err := fs.wormEnforcedForEntry(ctx, fullPath)
|
|
if err != nil {
|
|
return err
|
|
} else if enforced {
|
|
// you cannot change a worm file
|
|
return errors.New(constants.ErrMsgOperationNotPermitted)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (fs *FilerServer) wormEnforcedForEntry(ctx context.Context, fullPath string) (bool, error) {
|
|
rule := fs.filer.FilerConf.MatchStorageRule(fullPath)
|
|
if !rule.Worm {
|
|
return false, nil
|
|
}
|
|
|
|
entry, err := fs.filer.FindEntry(ctx, util.FullPath(fullPath))
|
|
if err != nil {
|
|
if errors.Is(err, filer_pb.ErrNotFound) {
|
|
return false, nil
|
|
}
|
|
|
|
return false, err
|
|
}
|
|
|
|
// worm is not enforced
|
|
if entry.WORMEnforcedAtTsNs == 0 {
|
|
return false, nil
|
|
}
|
|
|
|
// worm will never expire
|
|
if rule.WormRetentionTimeSeconds == 0 {
|
|
return true, nil
|
|
}
|
|
|
|
enforcedAt := time.Unix(0, entry.WORMEnforcedAtTsNs)
|
|
|
|
// worm is expired
|
|
if time.Now().Sub(enforcedAt).Seconds() >= float64(rule.WormRetentionTimeSeconds) {
|
|
return false, nil
|
|
}
|
|
|
|
return true, nil
|
|
}
|
|
|
|
func (fs *FilerServer) fixFilePath(ctx context.Context, r *http.Request, fileName string) string {
|
|
// fix the path
|
|
fullPath := r.URL.Path
|
|
if strings.HasSuffix(fullPath, "/") {
|
|
if fileName != "" {
|
|
fullPath += fileName
|
|
}
|
|
} else {
|
|
if fileName != "" {
|
|
if possibleDirEntry, findDirErr := fs.filer.FindEntry(ctx, util.FullPath(fullPath)); findDirErr == nil {
|
|
if possibleDirEntry.IsDirectory() {
|
|
fullPath += "/" + fileName
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return fullPath
|
|
}
|
|
|
|
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) {
|
|
|
|
// detect file mode
|
|
modeStr := r.URL.Query().Get("mode")
|
|
if modeStr == "" {
|
|
modeStr = "0660"
|
|
}
|
|
mode, err := strconv.ParseUint(modeStr, 8, 32)
|
|
if err != nil {
|
|
glog.ErrorfCtx(ctx, "Invalid mode format: %s, use 0660 by default", modeStr)
|
|
mode = 0660
|
|
}
|
|
|
|
// fix the path
|
|
path := fs.fixFilePath(ctx, r, fileName)
|
|
|
|
var entry *filer.Entry
|
|
var newChunks []*filer_pb.FileChunk
|
|
var mergedChunks []*filer_pb.FileChunk
|
|
|
|
isAppend := isAppend(r)
|
|
isOffsetWrite := len(fileChunks) > 0 && fileChunks[0].Offset > 0
|
|
// when it is an append
|
|
if isAppend || isOffsetWrite {
|
|
existingEntry, findErr := fs.filer.FindEntry(ctx, util.FullPath(path))
|
|
if findErr != nil && findErr != filer_pb.ErrNotFound {
|
|
glog.V(0).InfofCtx(ctx, "failing to find %s: %v", path, findErr)
|
|
}
|
|
entry = existingEntry
|
|
}
|
|
if entry != nil {
|
|
entry.Mtime = time.Now()
|
|
entry.Md5 = nil
|
|
// adjust chunk offsets
|
|
if isAppend {
|
|
for _, chunk := range fileChunks {
|
|
chunk.Offset += int64(entry.FileSize)
|
|
}
|
|
entry.FileSize += uint64(chunkOffset)
|
|
}
|
|
newChunks = append(entry.GetChunks(), fileChunks...)
|
|
|
|
// TODO
|
|
if len(entry.Content) > 0 {
|
|
replyerr = fmt.Errorf("append to small file is not supported yet")
|
|
return
|
|
}
|
|
|
|
} else {
|
|
glog.V(4).InfolnCtx(ctx, "saving", path)
|
|
newChunks = fileChunks
|
|
entry = &filer.Entry{
|
|
FullPath: util.FullPath(path),
|
|
Attr: filer.Attr{
|
|
Mtime: time.Now(),
|
|
Crtime: time.Now(),
|
|
Mode: os.FileMode(mode),
|
|
Uid: OS_UID,
|
|
Gid: OS_GID,
|
|
TtlSec: so.TtlSeconds,
|
|
Mime: contentType,
|
|
Md5: md5bytes,
|
|
FileSize: uint64(chunkOffset),
|
|
},
|
|
Content: content,
|
|
}
|
|
}
|
|
|
|
// maybe concatenate small chunks into one whole chunk
|
|
mergedChunks, replyerr = fs.maybeMergeChunks(ctx, so, newChunks)
|
|
if replyerr != nil {
|
|
glog.V(0).InfofCtx(ctx, "merge chunks %s: %v", r.RequestURI, replyerr)
|
|
mergedChunks = newChunks
|
|
}
|
|
|
|
// maybe compact entry chunks
|
|
mergedChunks, replyerr = filer.MaybeManifestize(fs.saveAsChunk(ctx, so), mergedChunks)
|
|
if replyerr != nil {
|
|
glog.V(0).InfofCtx(ctx, "manifestize %s: %v", r.RequestURI, replyerr)
|
|
return
|
|
}
|
|
entry.Chunks = mergedChunks
|
|
if isOffsetWrite {
|
|
entry.Md5 = nil
|
|
entry.FileSize = entry.Size()
|
|
}
|
|
|
|
filerResult = &FilerPostResult{
|
|
Name: fileName,
|
|
Size: int64(entry.FileSize),
|
|
}
|
|
|
|
// Save standard HTTP headers as extended attributes
|
|
// Note: S3 API now writes directly to volume servers and saves metadata via gRPC
|
|
// This handler is for non-S3 clients (WebDAV, SFTP, mount, curl, etc.)
|
|
if entry.Extended == nil {
|
|
entry.Extended = make(map[string][]byte)
|
|
}
|
|
for k, v := range r.Header {
|
|
if len(v) > 0 && len(v[0]) > 0 {
|
|
if strings.HasPrefix(k, needle.PairNamePrefix) || k == "Cache-Control" || k == "Expires" || k == "Content-Disposition" {
|
|
entry.Extended[k] = []byte(v[0])
|
|
}
|
|
if k == "Response-Content-Disposition" {
|
|
entry.Extended["Content-Disposition"] = []byte(v[0])
|
|
}
|
|
}
|
|
}
|
|
|
|
dbErr := fs.filer.CreateEntry(context.WithoutCancel(ctx), entry, false, false, nil, skipCheckParentDirEntry(r), so.MaxFileNameLength)
|
|
if dbErr != nil {
|
|
replyerr = dbErr
|
|
filerResult.Error = dbErr.Error()
|
|
glog.V(0).InfofCtx(ctx, "failing to write %s to filer server : %v", path, dbErr)
|
|
}
|
|
return filerResult, replyerr
|
|
}
|
|
|
|
func (fs *FilerServer) saveAsChunk(ctx context.Context, so *operation.StorageOption) filer.SaveDataAsChunkFunctionType {
|
|
|
|
return func(reader io.Reader, name string, offset int64, tsNs int64, expectedDataSize uint64) (*filer_pb.FileChunk, error) {
|
|
var fileId string
|
|
var uploadResult *operation.UploadResult
|
|
|
|
err := util.Retry("saveAsChunk", func() error {
|
|
// assign one file id for one chunk
|
|
assignedFileId, urlLocation, auth, assignErr := fs.assignNewFileInfo(ctx, so, expectedDataSize)
|
|
if assignErr != nil {
|
|
return assignErr
|
|
}
|
|
|
|
fileId = assignedFileId
|
|
|
|
// upload the chunk to the volume server
|
|
uploadOption := &operation.UploadOption{
|
|
UploadUrl: urlLocation,
|
|
Filename: name,
|
|
Cipher: fs.option.Cipher,
|
|
IsInputCompressed: false,
|
|
MimeType: "",
|
|
PairMap: nil,
|
|
Jwt: auth,
|
|
}
|
|
|
|
uploader, uploaderErr := operation.NewUploader()
|
|
if uploaderErr != nil {
|
|
return uploaderErr
|
|
}
|
|
|
|
var uploadErr error
|
|
uploadCtx := context.WithoutCancel(ctx)
|
|
uploadResult, uploadErr, _ = uploader.Upload(uploadCtx, reader, uploadOption)
|
|
if uploadErr != nil {
|
|
return uploadErr
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return uploadResult.ToPbFileChunk(fileId, offset, tsNs), nil
|
|
}
|
|
}
|
|
|
|
func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http.Request, so *operation.StorageOption) (filerResult *FilerPostResult, replyerr error) {
|
|
|
|
// detect file mode
|
|
modeStr := r.URL.Query().Get("mode")
|
|
if modeStr == "" {
|
|
modeStr = "0660"
|
|
}
|
|
mode, err := strconv.ParseUint(modeStr, 8, 32)
|
|
if err != nil {
|
|
glog.ErrorfCtx(ctx, "Invalid mode format: %s, use 0660 by default", modeStr)
|
|
mode = 0660
|
|
}
|
|
|
|
// fix the path
|
|
path := r.URL.Path
|
|
if strings.HasSuffix(path, "/") {
|
|
path = path[:len(path)-1]
|
|
}
|
|
|
|
existingEntry, err := fs.filer.FindEntry(ctx, util.FullPath(path))
|
|
if err == nil && existingEntry != nil {
|
|
replyerr = fmt.Errorf("dir %s already exists", path)
|
|
return
|
|
}
|
|
|
|
glog.V(4).InfolnCtx(ctx, "mkdir", path)
|
|
entry := &filer.Entry{
|
|
FullPath: util.FullPath(path),
|
|
Attr: filer.Attr{
|
|
Mtime: time.Now(),
|
|
Crtime: time.Now(),
|
|
Mode: os.FileMode(mode) | os.ModeDir,
|
|
Uid: OS_UID,
|
|
Gid: OS_GID,
|
|
TtlSec: so.TtlSeconds,
|
|
},
|
|
}
|
|
|
|
filerResult = &FilerPostResult{
|
|
Name: util.FullPath(path).Name(),
|
|
}
|
|
|
|
if dbErr := fs.filer.CreateEntry(context.WithoutCancel(ctx), entry, false, false, nil, false, so.MaxFileNameLength); dbErr != nil {
|
|
replyerr = dbErr
|
|
filerResult.Error = dbErr.Error()
|
|
glog.V(0).InfofCtx(ctx, "failing to create dir %s on filer server : %v", path, dbErr)
|
|
}
|
|
return filerResult, replyerr
|
|
}
|