mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-05-25 03:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

test s3 put

Browse Source
This commit is contained in:
Konstantin Lebedev
2025-11-04 20:03:36 +05:00
parent e8e080b4fa
commit 1abea0d9b5
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/s3api/filer_multipart.go
View File

@@ -468,7 +468,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl
entry.Attributes.Mime = mime
}
entry.Attributes.FileSize = uint64(offset)
if s3a.option.AllowDeleteObjectsByTTL && entry.Attributes.TtlSec > 0 {
if s3a.option.AllowDeleteObjectsByTTL {
entry.Extended[s3_constants.SeaweedFSExpiresS3] = []byte("true")
}
})

6
weed/server/filer_server_handlers_write.go
View File

@@ -98,12 +98,6 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request, conte
}
return
}
// Disable TTL-based (creation time) deletion when S3 expiry (modification time) is enabled
if so.TtlSeconds > 0 {
if s3ExpiresValue := r.Header.Get(s3_constants.SeaweedFSExpiresS3); s3ExpiresValue == "true" {
so.TtlSeconds = 0
}
}
if util.FullPath(r.URL.Path).IsLongerFileName(so.MaxFileNameLength) {
glog.V(1).InfolnCtx(ctx, "post", r.RequestURI, ": ", "entry name too long")
w.WriteHeader(http.StatusRequestURITooLong)

21
weed/server/filer_server_handlers_write_autochunk.go
View File

@@ -136,8 +136,27 @@ func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter
if err := fs.checkPermissions(ctx, r, fileName); err != nil {
return nil, nil, err
}
// Disable TTL-based (creation time) deletion when S3 expiry (modification time) is enabled
soMaybeWithOutTTL := so
if so.TtlSeconds > 0 {
if s3ExpiresValue := r.Header.Get(s3_constants.SeaweedFSExpiresS3); s3ExpiresValue == "true" {
soMaybeWithOutTTL = &operation.StorageOption{
so.Replication,
so.DiskType,
so.Collection,
so.DataCenter,
so.Rack,
so.DataNode,
0,
so.VolumeGrowthCount,
so.MaxFileNameLength,
so.Fsync,
so.SaveInside,
}
}
}
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, r.Body, chunkSize, fileName, contentType, contentLength, so)
fileChunks, md5Hash, chunkOffset, err, smallContent := fs.uploadRequestToChunks(ctx, w, r, r.Body, chunkSize, fileName, contentType, contentLength, soMaybeWithOutTTL)
if err != nil {
return nil, nil, err