S3: Directly read write volume servers (#7481)
* Lazy Versioning Check, Conditional SSE Entry Fetch, HEAD Request Optimization * revert Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata * Lazy Entry Fetch for SSE, Skip Conditional Header Check * SSE-KMS headers are present, this is not an SSE-C request (mutually exclusive) * SSE-C is mutually exclusive with SSE-S3 and SSE-KMS * refactor * Removed Premature Mutual Exclusivity Check * check for the presence of the X-Amz-Server-Side-Encryption header * not used * fmt * directly read write volume servers * HTTP Range Request Support * set header * md5 * copy object * fix sse * fmt * implement sse * sse continue * fixed the suffix range bug (bytes=-N for "last N bytes") * debug logs * Missing PartsCount Header * profiling * url encoding * test_multipart_get_part * headers * debug * adjust log level * handle part number * Update s3api_object_handlers.go * nil safety * set ModifiedTsNs * remove * nil check * fix sse header * same logic as filer * decode values * decode ivBase64 * s3: Fix SSE decryption JWT authentication and streaming errors Critical fix for SSE (Server-Side Encryption) test failures: 1. **JWT Authentication Bug** (Root Cause): - Changed from GenJwtForFilerServer to GenJwtForVolumeServer - S3 API now uses correct JWT when directly reading from volume servers - Matches filer's authentication pattern for direct volume access - Fixes 'unexpected EOF' and 500 errors in SSE tests 2. **Streaming Error Handling**: - Added error propagation in getEncryptedStreamFromVolumes goroutine - Use CloseWithError() to properly communicate stream failures - Added debug logging for streaming errors 3. **Response Header Timing**: - Removed premature WriteHeader(http.StatusOK) call - Let Go's http package write status automatically on first write - Prevents header lock when errors occur during streaming 4. **Enhanced SSE Decryption Debugging**: - Added IV/Key validation and logging for SSE-C, SSE-KMS, SSE-S3 - Better error messages for missing or invalid encryption metadata - Added glog.V(2) debugging for decryption setup This fixes SSE integration test failures where encrypted objects could not be retrieved due to volume server authentication failures. The JWT bug was causing volume servers to reject requests, resulting in truncated/empty streams (EOF) or internal errors. * s3: Fix SSE multipart upload metadata preservation Critical fix for SSE multipart upload test failures (SSE-C and SSE-KMS): **Root Cause - Incomplete SSE Metadata Copying**: The old code only tried to copy 'SeaweedFSSSEKMSKey' from the first part to the completed object. This had TWO bugs: 1. **Wrong Constant Name** (Key Mismatch Bug): - Storage uses: SeaweedFSSSEKMSKeyHeader = 'X-SeaweedFS-SSE-KMS-Key' - Old code read: SeaweedFSSSEKMSKey = 'x-seaweedfs-sse-kms-key' - Result: SSE-KMS metadata was NEVER copied → 500 errors 2. **Missing SSE-C and SSE-S3 Headers**: - SSE-C requires: IV, Algorithm, KeyMD5 - SSE-S3 requires: encrypted key data + standard headers - Old code: copied nothing for SSE-C/SSE-S3 → decryption failures **Fix - Complete SSE Header Preservation**: Now copies ALL SSE headers from first part to completed object: - SSE-C: SeaweedFSSSEIV, CustomerAlgorithm, CustomerKeyMD5 - SSE-KMS: SeaweedFSSSEKMSKeyHeader, AwsKmsKeyId, ServerSideEncryption - SSE-S3: SeaweedFSSSES3Key, ServerSideEncryption Applied consistently to all 3 code paths: 1. Versioned buckets (creates version file) 2. Suspended versioning (creates main object with null versionId) 3. Non-versioned buckets (creates main object) **Why This Is Correct**: The headers copied EXACTLY match what putToFiler stores during part upload (lines 496-521 in s3api_object_handlers_put.go). This ensures detectPrimarySSEType() can correctly identify encrypted multipart objects and trigger inline decryption with proper metadata. Fixes: TestSSEMultipartUploadIntegration (SSE-C and SSE-KMS subtests) * s3: Add debug logging for versioning state diagnosis Temporary debug logging to diagnose test_versioning_obj_plain_null_version_overwrite_suspended failure. Added glog.V(0) logging to show: 1. setBucketVersioningStatus: when versioning status is changed 2. PutObjectHandler: what versioning state is detected (Enabled/Suspended/none) 3. PutObjectHandler: which code path is taken (putVersionedObject vs putSuspendedVersioningObject) This will help identify if: - The versioning status is being set correctly in bucket config - The cache is returning stale/incorrect versioning state - The switch statement is correctly routing to suspended vs enabled handlers * s3: Enhanced versioning state tracing for suspended versioning diagnosis Added comprehensive logging across the entire versioning state flow: PutBucketVersioningHandler: - Log requested status (Enabled/Suspended) - Log when calling setBucketVersioningStatus - Log success/failure of status change setBucketVersioningStatus: - Log bucket and status being set - Log when config is updated - Log completion with error code updateBucketConfig: - Log versioning state being written to cache - Immediate cache verification after Set - Log if cache verification fails getVersioningState: - Log bucket name and state being returned - Log if object lock forces VersioningEnabled - Log errors This will reveal: 1. If PutBucketVersioning(Suspended) is reaching the handler 2. If the cache update succeeds 3. What state getVersioningState returns during PUT 4. Any cache consistency issues Expected to show why bucket still reports 'Enabled' after 'Suspended' call. * s3: Add SSE chunk detection debugging for multipart uploads Added comprehensive logging to diagnose why TestSSEMultipartUploadIntegration fails: detectPrimarySSEType now logs: 1. Total chunk count and extended header count 2. All extended headers with 'sse'/'SSE'/'encryption' in the name 3. For each chunk: index, SseType, and whether it has metadata 4. Final SSE type counts (SSE-C, SSE-KMS, SSE-S3) This will reveal if: - Chunks are missing SSE metadata after multipart completion - Extended headers are copied correctly from first part - The SSE detection logic is working correctly Expected to show if chunks have SseType=0 (none) or proper SSE types set. * s3: Trace SSE chunk metadata through multipart completion and retrieval Added end-to-end logging to track SSE chunk metadata lifecycle: **During Multipart Completion (filer_multipart.go)**: 1. Log finalParts chunks BEFORE mkFile - shows SseType and metadata 2. Log versionEntry.Chunks INSIDE mkFile callback - shows if mkFile preserves SSE info 3. Log success after mkFile completes **During GET Retrieval (s3api_object_handlers.go)**: 1. Log retrieved entry chunks - shows SseType and metadata after retrieval 2. Log detected SSE type result This will reveal at which point SSE chunk metadata is lost: - If finalParts have SSE metadata but versionEntry.Chunks don't → mkFile bug - If versionEntry.Chunks have SSE metadata but retrieved chunks don't → storage/retrieval bug - If chunks never have SSE metadata → multipart completion SSE processing bug Expected to show chunks with SseType=NONE during retrieval even though they were created with proper SseType during multipart completion. * s3: Fix SSE-C multipart IV base64 decoding bug **Critical Bug Found**: SSE-C multipart uploads were failing because: Root Cause: - entry.Extended[SeaweedFSSSEIV] stores base64-encoded IV (24 bytes for 16-byte IV) - SerializeSSECMetadata expects raw IV bytes (16 bytes) - During multipart completion, we were passing base64 IV directly → serialization error Error Message: "Failed to serialize SSE-C metadata for chunk in part X: invalid IV length: expected 16 bytes, got 24" Fix: - Base64-decode IV before passing to SerializeSSECMetadata - Added error handling for decode failures Impact: - SSE-C multipart uploads will now correctly serialize chunk metadata - Chunks will have proper SSE metadata for decryption during GET This fixes the SSE-C subtest of TestSSEMultipartUploadIntegration. SSE-KMS still has a separate issue (error code 23) being investigated. * fixes * kms sse * handle retry if not found in .versions folder and should read the normal object * quick check (no retries) to see if the .versions/ directory exists * skip retry if object is not found * explicit update to avoid sync delay * fix map update lock * Remove fmt.Printf debug statements * Fix SSE-KMS multipart base IV fallback to fail instead of regenerating * fmt * Fix ACL grants storage logic * header handling * nil handling * range read for sse content * test range requests for sse objects * fmt * unused code * upload in chunks * header case * fix url * bucket policy error vs bucket not found * jwt handling * fmt * jwt in request header * Optimize Case-Insensitive Prefix Check * dead code * Eliminated Unnecessary Stream Prefetch for Multipart SSE * range sse * sse * refactor * context * fmt * fix type * fix SSE-C IV Mismatch * Fix Headers Being Set After WriteHeader * fix url parsing * propergate sse headers * multipart sse-s3 * aws sig v4 authen * sse kms * set content range * better errors * Update s3api_object_handlers_copy.go * Update s3api_object_handlers.go * Update s3api_object_handlers.go * avoid magic number * clean up * Update s3api_bucket_policy_handlers.go * fix url parsing * context * data and metadata both use background context * adjust the offset * SSE Range Request IV Calculation * adjust logs * IV relative to offset in each part, not the whole file * collect logs * offset * fix offset * fix url * logs * variable * jwt * Multipart ETag semantics: conditionally set object-level Md5 for single-chunk uploads only. * sse * adjust IV and offset * multipart boundaries * ensures PUT and GET operations return consistent ETags * Metadata Header Case * CommonPrefixes Sorting with URL Encoding * always sort * remove the extra PathUnescape call * fix the multipart get part ETag * the FileChunk is created without setting ModifiedTsNs * Sort CommonPrefixes lexicographically to match AWS S3 behavior * set md5 for multipart uploads * prevents any potential data loss or corruption in the small-file inline storage path * compiles correctly * decryptedReader will now be properly closed after use * Fixed URL encoding and sort order for CommonPrefixes * Update s3api_object_handlers_list.go * SSE-x Chunk View Decryption * Different IV offset calculations for single-part vs multipart objects * still too verbose in logs * less logs * ensure correct conversion * fix listing * nil check * minor fixes * nil check * single character delimiter * optimize * range on empty object or zero-length * correct IV based on its position within that part, not its position in the entire object * adjust offset * offset Fetch FULL encrypted chunk (not just the range) Adjust IV by PartOffset/ChunkOffset only Decrypt full chunk Skip in the DECRYPTED stream to reach OffsetInChunk * look breaking * refactor * error on no content * handle intra-block byte skipping * Incomplete HTTP Response Error Handling * multipart SSE * Update s3api_object_handlers.go * address comments * less logs * handling directory * Optimized rejectDirectoryObjectWithoutSlash() to avoid unnecessary lookups * Revert "handling directory" This reverts commit 3a335f0ac33c63f51975abc63c40e5328857a74b. * constant * Consolidate nil entry checks in GetObjectHandler * add range tests * Consolidate redundant nil entry checks in HeadObjectHandler * adjust logs * SSE type * large files * large files Reverted the plain-object range test * ErrNoEncryptionConfig * Fixed SSERangeReader Infinite Loop Vulnerability * Fixed SSE-KMS Multipart ChunkReader HTTP Body Leak * handle empty directory in S3, added PyArrow tests * purge unused code * Update s3_parquet_test.py * Update requirements.txt * According to S3 specifications, when both partNumber and Range are present, the Range should apply within the selected part's boundaries, not to the full object. * handle errors * errors after writing header * https * fix: Wait for volume assignment readiness before running Parquet tests The test-implicit-dir-with-server test was failing with an Internal Error because volume assignment was not ready when tests started. This fix adds a check that attempts a volume assignment and waits for it to succeed before proceeding with tests. This ensures that: 1. Volume servers are registered with the master 2. Volume growth is triggered if needed 3. The system can successfully assign volumes for writes Fixes the timeout issue where boto3 would retry 4 times and fail with 'We encountered an internal error, please try again.' * sse tests * store derived IV * fix: Clean up gRPC ports between tests to prevent port conflicts The second test (test-implicit-dir-with-server) was failing because the volume server's gRPC port (18080 = VOLUME_PORT + 10000) was still in use from the first test. The cleanup code only killed HTTP port processes, not gRPC port processes. Added cleanup for gRPC ports in all stop targets: - Master gRPC: MASTER_PORT + 10000 (19333) - Volume gRPC: VOLUME_PORT + 10000 (18080) - Filer gRPC: FILER_PORT + 10000 (18888) This ensures clean state between test runs in CI. * add import * address comments * docs: Add placeholder documentation files for Parquet test suite Added three missing documentation files referenced in test/s3/parquet/README.md: 1. TEST_COVERAGE.md - Documents 43 total test cases (17 Go unit tests, 6 Python integration tests, 20 Python end-to-end tests) 2. FINAL_ROOT_CAUSE_ANALYSIS.md - Explains the s3fs compatibility issue with PyArrow, the implicit directory problem, and how the fix works 3. MINIO_DIRECTORY_HANDLING.md - Compares MinIO's directory handling approach with SeaweedFS's implementation Each file contains: - Title and overview - Key technical details relevant to the topic - TODO sections for future expansion These placeholder files resolve the broken README links and provide structure for future detailed documentation. * clean up if metadata operation failed * Update s3_parquet_test.py * clean up * Update Makefile * Update s3_parquet_test.py * Update Makefile * Handle ivSkip for non-block-aligned offsets * Update README.md * stop volume server faster * stop volume server in 1 second * different IV for each chunk in SSE-S3 and SSE-KMS * clean up if fails * testing upload * error propagation * fmt * simplify * fix copying * less logs * endian * Added marshaling error handling * handling invalid ranges * error handling for adding to log buffer * fix logging * avoid returning too quickly and ensure proper cleaning up * Activity Tracking for Disk Reads * Cleanup Unused Parameters * Activity Tracking for Kafka Publishers * Proper Test Error Reporting * refactoring * less logs * less logs * go fmt * guard it with if entry.Attributes.TtlSec > 0 to match the pattern used elsewhere. * Handle bucket-default encryption config errors explicitly for multipart * consistent activity tracking * obsolete code for s3 on filer read/write handlers * Update weed/s3api/s3api_object_handlers_list.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
Chris Lu
267
weed/operation/upload_chunked.go
Normal file
267
weed/operation/upload_chunked.go
Normal file
@@ -0,0 +1,267 @@
|
||||
package operation
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"fmt"
|
||||
"hash"
|
||||
"io"
|
||||
"sort"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||||
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
||||
"github.com/seaweedfs/seaweedfs/weed/security"
|
||||
)
|
||||
|
||||
// ChunkedUploadResult contains the result of a chunked upload
|
||||
type ChunkedUploadResult struct {
|
||||
FileChunks []*filer_pb.FileChunk
|
||||
Md5Hash hash.Hash
|
||||
TotalSize int64
|
||||
SmallContent []byte // For files smaller than threshold
|
||||
}
|
||||
|
||||
// ChunkedUploadOption contains options for chunked uploads
|
||||
type ChunkedUploadOption struct {
|
||||
ChunkSize int32
|
||||
SmallFileLimit int64
|
||||
Collection string
|
||||
Replication string
|
||||
DataCenter string
|
||||
SaveSmallInline bool
|
||||
Jwt security.EncodedJwt
|
||||
MimeType string
|
||||
AssignFunc func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error)
|
||||
UploadFunc func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) // Optional: for testing
|
||||
}
|
||||
|
||||
var chunkBufferPool = sync.Pool{
|
||||
New: func() interface{} {
|
||||
return new(bytes.Buffer)
|
||||
},
|
||||
}
|
||||
|
||||
// UploadReaderInChunks reads from reader and uploads in chunks to volume servers
|
||||
// This prevents OOM by processing the stream in fixed-size chunks
|
||||
// Returns file chunks, MD5 hash, total size, and any small content stored inline
|
||||
func UploadReaderInChunks(ctx context.Context, reader io.Reader, opt *ChunkedUploadOption) (*ChunkedUploadResult, error) {
|
||||
|
||||
md5Hash := md5.New()
|
||||
var partReader = io.TeeReader(reader, md5Hash)
|
||||
|
||||
var fileChunks []*filer_pb.FileChunk
|
||||
var fileChunksLock sync.Mutex
|
||||
var uploadErr error
|
||||
var uploadErrLock sync.Mutex
|
||||
var chunkOffset int64 = 0
|
||||
|
||||
var wg sync.WaitGroup
|
||||
const bytesBufferCounter = 4
|
||||
bytesBufferLimitChan := make(chan struct{}, bytesBufferCounter)
|
||||
|
||||
uploadLoop:
|
||||
for {
|
||||
// Throttle buffer usage
|
||||
bytesBufferLimitChan <- struct{}{}
|
||||
|
||||
// Check for errors from parallel uploads
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr != nil {
|
||||
<-bytesBufferLimitChan
|
||||
uploadErrLock.Unlock()
|
||||
break
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
|
||||
// Check for context cancellation
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
<-bytesBufferLimitChan
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr == nil {
|
||||
uploadErr = ctx.Err()
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
break uploadLoop
|
||||
default:
|
||||
}
|
||||
|
||||
// Get buffer from pool
|
||||
bytesBuffer := chunkBufferPool.Get().(*bytes.Buffer)
|
||||
limitedReader := io.LimitReader(partReader, int64(opt.ChunkSize))
|
||||
bytesBuffer.Reset()
|
||||
|
||||
// Read one chunk
|
||||
dataSize, err := bytesBuffer.ReadFrom(limitedReader)
|
||||
if err != nil {
|
||||
glog.V(2).Infof("UploadReaderInChunks: read error at offset %d: %v", chunkOffset, err)
|
||||
chunkBufferPool.Put(bytesBuffer)
|
||||
<-bytesBufferLimitChan
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr == nil {
|
||||
uploadErr = err
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
break
|
||||
}
|
||||
// If no data was read, we've reached EOF
|
||||
// Only break if we've already read some data (chunkOffset > 0) or if this is truly EOF
|
||||
if dataSize == 0 {
|
||||
if chunkOffset == 0 {
|
||||
glog.Warningf("UploadReaderInChunks: received 0 bytes on first read - creating empty file")
|
||||
}
|
||||
chunkBufferPool.Put(bytesBuffer)
|
||||
<-bytesBufferLimitChan
|
||||
// If we've already read some chunks, this is normal EOF
|
||||
// If we haven't read anything yet (chunkOffset == 0), this could be an empty file
|
||||
// which is valid (e.g., touch command creates 0-byte files)
|
||||
break
|
||||
}
|
||||
|
||||
// For small files at offset 0, store inline instead of uploading
|
||||
if chunkOffset == 0 && opt.SaveSmallInline && dataSize < opt.SmallFileLimit {
|
||||
smallContent := make([]byte, dataSize)
|
||||
n, readErr := io.ReadFull(bytesBuffer, smallContent)
|
||||
chunkBufferPool.Put(bytesBuffer)
|
||||
<-bytesBufferLimitChan
|
||||
|
||||
if readErr != nil {
|
||||
return nil, fmt.Errorf("failed to read small content: read %d of %d bytes: %w", n, dataSize, readErr)
|
||||
}
|
||||
|
||||
return &ChunkedUploadResult{
|
||||
FileChunks: nil,
|
||||
Md5Hash: md5Hash,
|
||||
TotalSize: dataSize,
|
||||
SmallContent: smallContent,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Upload chunk in parallel goroutine
|
||||
wg.Add(1)
|
||||
go func(offset int64, buf *bytes.Buffer) {
|
||||
defer func() {
|
||||
chunkBufferPool.Put(buf)
|
||||
<-bytesBufferLimitChan
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// Assign volume for this chunk
|
||||
_, assignResult, assignErr := opt.AssignFunc(ctx, 1)
|
||||
if assignErr != nil {
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr == nil {
|
||||
uploadErr = fmt.Errorf("assign volume: %w", assignErr)
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
return
|
||||
}
|
||||
|
||||
// Upload chunk data
|
||||
uploadUrl := fmt.Sprintf("http://%s/%s", assignResult.Url, assignResult.Fid)
|
||||
|
||||
// Use per-assignment JWT if present, otherwise fall back to the original JWT
|
||||
// This is critical for secured clusters where each volume assignment has its own JWT
|
||||
jwt := opt.Jwt
|
||||
if assignResult.Auth != "" {
|
||||
jwt = assignResult.Auth
|
||||
}
|
||||
|
||||
uploadOption := &UploadOption{
|
||||
UploadUrl: uploadUrl,
|
||||
Cipher: false,
|
||||
IsInputCompressed: false,
|
||||
MimeType: opt.MimeType,
|
||||
PairMap: nil,
|
||||
Jwt: jwt,
|
||||
}
|
||||
|
||||
var uploadResult *UploadResult
|
||||
var uploadResultErr error
|
||||
|
||||
// Use mock upload function if provided (for testing), otherwise use real uploader
|
||||
if opt.UploadFunc != nil {
|
||||
uploadResult, uploadResultErr = opt.UploadFunc(ctx, buf.Bytes(), uploadOption)
|
||||
} else {
|
||||
uploader, uploaderErr := NewUploader()
|
||||
if uploaderErr != nil {
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr == nil {
|
||||
uploadErr = fmt.Errorf("create uploader: %w", uploaderErr)
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
return
|
||||
}
|
||||
uploadResult, uploadResultErr = uploader.UploadData(ctx, buf.Bytes(), uploadOption)
|
||||
}
|
||||
|
||||
if uploadResultErr != nil {
|
||||
uploadErrLock.Lock()
|
||||
if uploadErr == nil {
|
||||
uploadErr = fmt.Errorf("upload chunk: %w", uploadResultErr)
|
||||
}
|
||||
uploadErrLock.Unlock()
|
||||
return
|
||||
}
|
||||
|
||||
// Create chunk entry
|
||||
// Set ModifiedTsNs to current time (nanoseconds) to track when upload completed
|
||||
// This is critical for multipart uploads where the same part may be uploaded multiple times
|
||||
// The part with the latest ModifiedTsNs is selected as the authoritative version
|
||||
fid, _ := filer_pb.ToFileIdObject(assignResult.Fid)
|
||||
chunk := &filer_pb.FileChunk{
|
||||
FileId: assignResult.Fid,
|
||||
Offset: offset,
|
||||
Size: uint64(uploadResult.Size),
|
||||
ModifiedTsNs: time.Now().UnixNano(),
|
||||
ETag: uploadResult.ContentMd5,
|
||||
Fid: fid,
|
||||
CipherKey: uploadResult.CipherKey,
|
||||
}
|
||||
|
||||
fileChunksLock.Lock()
|
||||
fileChunks = append(fileChunks, chunk)
|
||||
glog.V(4).Infof("uploaded chunk %d to %s [%d,%d)", len(fileChunks), chunk.FileId, offset, offset+int64(chunk.Size))
|
||||
fileChunksLock.Unlock()
|
||||
|
||||
}(chunkOffset, bytesBuffer)
|
||||
|
||||
// Update offset for next chunk
|
||||
chunkOffset += dataSize
|
||||
|
||||
// If this was a partial chunk, we're done
|
||||
if dataSize < int64(opt.ChunkSize) {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Wait for all uploads to complete
|
||||
wg.Wait()
|
||||
|
||||
// Sort chunks by offset (do this even if there's an error, for cleanup purposes)
|
||||
sort.Slice(fileChunks, func(i, j int) bool {
|
||||
return fileChunks[i].Offset < fileChunks[j].Offset
|
||||
})
|
||||
|
||||
// Check for errors - return partial results for cleanup
|
||||
if uploadErr != nil {
|
||||
glog.Errorf("chunked upload failed: %v (returning %d partial chunks for cleanup)", uploadErr, len(fileChunks))
|
||||
// IMPORTANT: Return partial results even on error so caller can cleanup orphaned chunks
|
||||
return &ChunkedUploadResult{
|
||||
FileChunks: fileChunks,
|
||||
Md5Hash: md5Hash,
|
||||
TotalSize: chunkOffset,
|
||||
SmallContent: nil,
|
||||
}, uploadErr
|
||||
}
|
||||
|
||||
return &ChunkedUploadResult{
|
||||
FileChunks: fileChunks,
|
||||
Md5Hash: md5Hash,
|
||||
TotalSize: chunkOffset,
|
||||
SmallContent: nil,
|
||||
}, nil
|
||||
}
|
||||
312
weed/operation/upload_chunked_test.go
Normal file
312
weed/operation/upload_chunked_test.go
Normal file
@@ -0,0 +1,312 @@
|
||||
package operation
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestUploadReaderInChunksReturnsPartialResultsOnError verifies that when
|
||||
// UploadReaderInChunks fails mid-upload, it returns partial results containing
|
||||
// the chunks that were successfully uploaded before the error occurred.
|
||||
// This allows the caller to cleanup orphaned chunks and prevent resource leaks.
|
||||
func TestUploadReaderInChunksReturnsPartialResultsOnError(t *testing.T) {
|
||||
// Create test data larger than one chunk to force multiple chunk uploads
|
||||
testData := bytes.Repeat([]byte("test data for chunk upload failure testing"), 1000) // ~40KB
|
||||
reader := bytes.NewReader(testData)
|
||||
|
||||
uploadAttempts := 0
|
||||
|
||||
// Create a mock assign function that succeeds for first chunk, then fails
|
||||
assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) {
|
||||
uploadAttempts++
|
||||
|
||||
if uploadAttempts == 1 {
|
||||
// First chunk succeeds
|
||||
return nil, &AssignResult{
|
||||
Fid: "test-fid-1,1234",
|
||||
Url: "http://test-volume-1:8080",
|
||||
PublicUrl: "http://test-volume-1:8080",
|
||||
Count: 1,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Second chunk fails (simulating volume server down or network error)
|
||||
return nil, nil, errors.New("simulated volume assignment failure")
|
||||
}
|
||||
|
||||
// Mock upload function that simulates successful upload
|
||||
uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) {
|
||||
return &UploadResult{
|
||||
Name: "test-file",
|
||||
Size: uint32(len(data)),
|
||||
ContentMd5: "mock-md5-hash",
|
||||
Error: "",
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Attempt upload with small chunk size to trigger multiple uploads
|
||||
result, err := UploadReaderInChunks(context.Background(), reader, &ChunkedUploadOption{
|
||||
ChunkSize: 8 * 1024, // 8KB chunks
|
||||
SmallFileLimit: 256,
|
||||
Collection: "test",
|
||||
DataCenter: "",
|
||||
SaveSmallInline: false,
|
||||
AssignFunc: assignFunc,
|
||||
UploadFunc: uploadFunc,
|
||||
})
|
||||
|
||||
// VERIFICATION 1: Error should be returned
|
||||
if err == nil {
|
||||
t.Fatal("Expected error from UploadReaderInChunks, got nil")
|
||||
}
|
||||
t.Logf("✓ Got expected error: %v", err)
|
||||
|
||||
// VERIFICATION 2: Result should NOT be nil (this is the fix)
|
||||
if result == nil {
|
||||
t.Fatal("CRITICAL: UploadReaderInChunks returned nil result on error - caller cannot cleanup orphaned chunks!")
|
||||
}
|
||||
t.Log("✓ Result is not nil (partial results returned)")
|
||||
|
||||
// VERIFICATION 3: Result should contain partial chunks from successful uploads
|
||||
// Note: In reality, the first chunk upload would succeed before assignment fails for chunk 2
|
||||
// But in this test, assignment fails immediately for chunk 2, so we may have 0 chunks
|
||||
// The important thing is that the result struct is returned, not that it has chunks
|
||||
t.Logf("✓ Result contains %d chunks (may be 0 if all assignments failed)", len(result.FileChunks))
|
||||
|
||||
// VERIFICATION 4: MD5 hash should be available even on partial failure
|
||||
if result.Md5Hash == nil {
|
||||
t.Error("Expected Md5Hash to be non-nil")
|
||||
} else {
|
||||
t.Log("✓ Md5Hash is available for partial data")
|
||||
}
|
||||
|
||||
// VERIFICATION 5: TotalSize should reflect bytes read before failure
|
||||
if result.TotalSize < 0 {
|
||||
t.Errorf("Expected non-negative TotalSize, got %d", result.TotalSize)
|
||||
} else {
|
||||
t.Logf("✓ TotalSize = %d bytes read before failure", result.TotalSize)
|
||||
}
|
||||
}
|
||||
|
||||
// TestUploadReaderInChunksSuccessPath verifies normal successful upload behavior
|
||||
func TestUploadReaderInChunksSuccessPath(t *testing.T) {
|
||||
testData := []byte("small test data")
|
||||
reader := bytes.NewReader(testData)
|
||||
|
||||
// Mock assign function that always succeeds
|
||||
assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) {
|
||||
return nil, &AssignResult{
|
||||
Fid: "test-fid,1234",
|
||||
Url: "http://test-volume:8080",
|
||||
PublicUrl: "http://test-volume:8080",
|
||||
Count: 1,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Mock upload function that simulates successful upload
|
||||
uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) {
|
||||
return &UploadResult{
|
||||
Name: "test-file",
|
||||
Size: uint32(len(data)),
|
||||
ContentMd5: "mock-md5-hash",
|
||||
Error: "",
|
||||
}, nil
|
||||
}
|
||||
|
||||
result, err := UploadReaderInChunks(context.Background(), reader, &ChunkedUploadOption{
|
||||
ChunkSize: 8 * 1024,
|
||||
SmallFileLimit: 256,
|
||||
Collection: "test",
|
||||
DataCenter: "",
|
||||
SaveSmallInline: false,
|
||||
AssignFunc: assignFunc,
|
||||
UploadFunc: uploadFunc,
|
||||
})
|
||||
|
||||
// VERIFICATION 1: No error should occur
|
||||
if err != nil {
|
||||
t.Fatalf("Expected successful upload, got error: %v", err)
|
||||
}
|
||||
t.Log("✓ Upload completed without error")
|
||||
|
||||
// VERIFICATION 2: Result should not be nil
|
||||
if result == nil {
|
||||
t.Fatal("Expected non-nil result")
|
||||
}
|
||||
t.Log("✓ Result is not nil")
|
||||
|
||||
// VERIFICATION 3: Should have file chunks
|
||||
if len(result.FileChunks) == 0 {
|
||||
t.Error("Expected at least one file chunk")
|
||||
} else {
|
||||
t.Logf("✓ Result contains %d file chunk(s)", len(result.FileChunks))
|
||||
}
|
||||
|
||||
// VERIFICATION 4: Total size should match input data
|
||||
if result.TotalSize != int64(len(testData)) {
|
||||
t.Errorf("Expected TotalSize=%d, got %d", len(testData), result.TotalSize)
|
||||
} else {
|
||||
t.Logf("✓ TotalSize=%d matches input data", result.TotalSize)
|
||||
}
|
||||
|
||||
// VERIFICATION 5: MD5 hash should be available
|
||||
if result.Md5Hash == nil {
|
||||
t.Error("Expected non-nil Md5Hash")
|
||||
} else {
|
||||
t.Log("✓ Md5Hash is available")
|
||||
}
|
||||
|
||||
// VERIFICATION 6: Chunk should have expected properties
|
||||
if len(result.FileChunks) > 0 {
|
||||
chunk := result.FileChunks[0]
|
||||
if chunk.FileId != "test-fid,1234" {
|
||||
t.Errorf("Expected chunk FileId='test-fid,1234', got '%s'", chunk.FileId)
|
||||
}
|
||||
if chunk.Offset != 0 {
|
||||
t.Errorf("Expected chunk Offset=0, got %d", chunk.Offset)
|
||||
}
|
||||
if chunk.Size != uint64(len(testData)) {
|
||||
t.Errorf("Expected chunk Size=%d, got %d", len(testData), chunk.Size)
|
||||
}
|
||||
t.Logf("✓ Chunk properties validated: FileId=%s, Offset=%d, Size=%d",
|
||||
chunk.FileId, chunk.Offset, chunk.Size)
|
||||
}
|
||||
}
|
||||
|
||||
// TestUploadReaderInChunksContextCancellation verifies behavior when context is cancelled
|
||||
func TestUploadReaderInChunksContextCancellation(t *testing.T) {
|
||||
testData := bytes.Repeat([]byte("test data"), 10000) // ~80KB
|
||||
reader := bytes.NewReader(testData)
|
||||
|
||||
// Create a context that we'll cancel
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
// Cancel immediately to trigger cancellation handling
|
||||
cancel()
|
||||
|
||||
assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) {
|
||||
return nil, &AssignResult{
|
||||
Fid: "test-fid,1234",
|
||||
Url: "http://test-volume:8080",
|
||||
PublicUrl: "http://test-volume:8080",
|
||||
Count: 1,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Mock upload function that simulates successful upload
|
||||
uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) {
|
||||
return &UploadResult{
|
||||
Name: "test-file",
|
||||
Size: uint32(len(data)),
|
||||
ContentMd5: "mock-md5-hash",
|
||||
Error: "",
|
||||
}, nil
|
||||
}
|
||||
|
||||
result, err := UploadReaderInChunks(ctx, reader, &ChunkedUploadOption{
|
||||
ChunkSize: 8 * 1024,
|
||||
SmallFileLimit: 256,
|
||||
Collection: "test",
|
||||
DataCenter: "",
|
||||
SaveSmallInline: false,
|
||||
AssignFunc: assignFunc,
|
||||
UploadFunc: uploadFunc,
|
||||
})
|
||||
|
||||
// Should get context cancelled error
|
||||
if err == nil {
|
||||
t.Error("Expected context cancellation error")
|
||||
}
|
||||
|
||||
// Should still get partial results for cleanup
|
||||
if result == nil {
|
||||
t.Error("Expected non-nil result even on context cancellation")
|
||||
} else {
|
||||
t.Logf("✓ Got partial result on cancellation: chunks=%d", len(result.FileChunks))
|
||||
}
|
||||
}
|
||||
|
||||
// mockFailingReader simulates a reader that fails after reading some data
|
||||
type mockFailingReader struct {
|
||||
data []byte
|
||||
pos int
|
||||
failAfter int
|
||||
}
|
||||
|
||||
func (m *mockFailingReader) Read(p []byte) (n int, err error) {
|
||||
if m.pos >= m.failAfter {
|
||||
return 0, errors.New("simulated read failure")
|
||||
}
|
||||
|
||||
remaining := m.failAfter - m.pos
|
||||
toRead := len(p)
|
||||
if toRead > remaining {
|
||||
toRead = remaining
|
||||
}
|
||||
if toRead > len(m.data)-m.pos {
|
||||
toRead = len(m.data) - m.pos
|
||||
}
|
||||
|
||||
if toRead == 0 {
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
copy(p, m.data[m.pos:m.pos+toRead])
|
||||
m.pos += toRead
|
||||
return toRead, nil
|
||||
}
|
||||
|
||||
// TestUploadReaderInChunksReaderFailure verifies behavior when reader fails mid-read
|
||||
func TestUploadReaderInChunksReaderFailure(t *testing.T) {
|
||||
testData := bytes.Repeat([]byte("test"), 5000) // 20KB
|
||||
failingReader := &mockFailingReader{
|
||||
data: testData,
|
||||
pos: 0,
|
||||
failAfter: 10000, // Fail after 10KB
|
||||
}
|
||||
|
||||
assignFunc := func(ctx context.Context, count int) (*VolumeAssignRequest, *AssignResult, error) {
|
||||
return nil, &AssignResult{
|
||||
Fid: "test-fid,1234",
|
||||
Url: "http://test-volume:8080",
|
||||
PublicUrl: "http://test-volume:8080",
|
||||
Count: 1,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Mock upload function that simulates successful upload
|
||||
uploadFunc := func(ctx context.Context, data []byte, option *UploadOption) (*UploadResult, error) {
|
||||
return &UploadResult{
|
||||
Name: "test-file",
|
||||
Size: uint32(len(data)),
|
||||
ContentMd5: "mock-md5-hash",
|
||||
Error: "",
|
||||
}, nil
|
||||
}
|
||||
|
||||
result, err := UploadReaderInChunks(context.Background(), failingReader, &ChunkedUploadOption{
|
||||
ChunkSize: 8 * 1024, // 8KB chunks
|
||||
SmallFileLimit: 256,
|
||||
Collection: "test",
|
||||
DataCenter: "",
|
||||
SaveSmallInline: false,
|
||||
AssignFunc: assignFunc,
|
||||
UploadFunc: uploadFunc,
|
||||
})
|
||||
|
||||
// Should get read error
|
||||
if err == nil {
|
||||
t.Error("Expected read failure error")
|
||||
}
|
||||
|
||||
// Should still get partial results
|
||||
if result == nil {
|
||||
t.Fatal("Expected non-nil result on read failure")
|
||||
}
|
||||
|
||||
t.Logf("✓ Got partial result on read failure: chunks=%d, totalSize=%d",
|
||||
len(result.FileChunks), result.TotalSize)
|
||||
}
|
||||
Reference in New Issue
Block a user