c284e51d20
* fix multipart etag * address comments * clean up * clean up * optimization * address comments * unquoted etag * dedup * upgrade * clean * etag * return quoted tag * quoted etag * debug * s3api: unify ETag retrieval and quoting across handlers Refactor newListEntry to take *S3ApiServer and use getObjectETag, and update setResponseHeaders to use the same logic. This ensures consistent ETags are returned for both listing and direct access. * s3api: implement ListObjects deduplication for versioned buckets Handle duplicate entries between the main path and the .versions directory by prioritizing the latest version when bucket versioning is enabled. * s3api: cleanup stale main file entries during versioned uploads Add explicit deletion of pre-existing "main" files when creating new versions in versioned buckets. This prevents stale entries from appearing in bucket listings and ensures consistency. * s3api: fix cleanup code placement in versioned uploads Correct the placement of rm calls in completeMultipartUpload and putVersionedObject to ensure stale main files are properly deleted during versioned uploads. * s3api: improve getObjectETag fallback for empty ExtETagKey Ensure that when ExtETagKey exists but contains an empty value, the function falls through to MD5/chunk-based calculation instead of returning an empty string. * s3api: fix test files for new newListEntry signature Update test files to use the new newListEntry signature where the first parameter is *S3ApiServer. Created mockS3ApiServer to properly test owner display name lookup functionality. * s3api: use filer.ETag for consistent Md5 handling in getEtagFromEntry Change getEtagFromEntry fallback to use filer.ETag(entry) instead of filer.ETagChunks to ensure legacy entries with Attributes.Md5 are handled consistently with the rest of the codebase. * s3api: optimize list logic and fix conditional header logging - Hoist bucket versioning check out of per-entry callback to avoid repeated getVersioningState calls - Extract appendOrDedup helper function to eliminate duplicate dedup/append logic across multiple code paths - Change If-Match mismatch logging from glog.Errorf to glog.V(3).Infof and remove DEBUG prefix for consistency * s3api: fix test mock to properly initialize IAM accounts Fixed nil pointer dereference in TestNewListEntryOwnerDisplayName by directly initializing the IdentityAccessManagement.accounts map in the test setup. This ensures newListEntry can properly look up account display names without panicking. * cleanup * s3api: remove premature main file cleanup in versioned uploads Removed incorrect cleanup logic that was deleting main files during versioned uploads. This was causing test failures because it deleted objects that should have been preserved as null versions when versioning was first enabled. The deduplication logic in listing is sufficient to handle duplicate entries without deleting files during upload. * s3api: add empty-value guard to getEtagFromEntry Added the same empty-value guard used in getObjectETag to prevent returning quoted empty strings. When ExtETagKey exists but is empty, the function now falls through to filer.ETag calculation instead of returning "". * s3api: fix listing of directory key objects with matching prefix Revert prefix handling logic to use strings.TrimPrefix instead of checking HasPrefix with empty string result. This ensures that when a directory key object exactly matches the prefix (e.g. prefix="dir/", object="dir/"), it is correctly handled as a regular entry instead of being skipped or incorrectly processed as a common prefix. Also fixed missing variable definition. * s3api: refactor list inline dedup to use appendOrDedup helper Refactored the inline deduplication logic in listFilerEntries to use the shared appendOrDedup helper function. This ensures consistent behavior and reduces code duplication. * test: fix port allocation race in s3tables integration test Updated startMiniCluster to find all required ports simultaneously using findAvailablePorts instead of sequentially. This prevents race conditions where the OS reallocates a port that was just released, causing multiple services (e.g. Filer and Volume) to be assigned the same port and fail to start.
S3 ETag Format Integration Tests
This test suite verifies that SeaweedFS returns correct ETag formats for S3 operations, ensuring compatibility with AWS S3 SDKs.
Background
GitHub Issue #7768: AWS S3 SDK for Java v2 was failing with Invalid base 16 character: '-' when performing PutObject on large files.
Root Cause
SeaweedFS internally auto-chunks large files (>8MB) for efficient storage. Previously, when a regular PutObject request resulted in multiple internal chunks, SeaweedFS returned a composite ETag format (<md5>-<count>) instead of a pure MD5 hash.
AWS S3 Specification
| Operation | ETag Format | Example |
|---|---|---|
| PutObject (any size) | Pure MD5 hex (32 chars) | d41d8cd98f00b204e9800998ecf8427e |
| CompleteMultipartUpload | Composite (<md5>-<partcount>) |
d41d8cd98f00b204e9800998ecf8427e-3 |
AWS S3 SDK v2 for Java validates PutObject ETags as hexadecimal, which fails when the ETag contains a hyphen.
Test Coverage
| Test | File Size | Purpose |
|---|---|---|
TestPutObjectETagFormat_SmallFile |
1KB | Verify single-chunk uploads return pure MD5 |
TestPutObjectETagFormat_LargeFile |
10MB | Critical: Verify auto-chunked uploads return pure MD5 |
TestPutObjectETagFormat_ExtraLargeFile |
25MB | Verify multi-chunk auto-chunked uploads return pure MD5 |
TestMultipartUploadETagFormat |
15MB | Verify multipart uploads correctly return composite ETag |
TestPutObjectETagConsistency |
Various | Verify ETag consistency across PUT/HEAD/GET |
TestETagHexValidation |
10MB | Simulate AWS SDK v2 hex validation |
TestMultipleLargeFileUploads |
10MB x5 | Stress test multiple large uploads |
Prerequisites
-
SeaweedFS running with S3 API enabled:
weed server -s3 -
Go 1.21 or later
-
AWS SDK v2 for Go (installed via go modules)
Running Tests
# Run all tests
make test
# Run only large file tests (the critical ones for issue #7768)
make test-large
# Run quick tests (small files only)
make test-quick
# Run with verbose output
make test-verbose
Configuration
By default, tests connect to http://127.0.0.1:8333. To use a different endpoint:
S3_ENDPOINT=http://localhost:8333 make test
Or modify defaultConfig in s3_etag_test.go.
SDK Compatibility
These tests use AWS SDK v2 for Go, which has the same ETag validation behavior as AWS SDK v2 for Java. The tests include:
- ETag format validation (pure MD5 vs composite)
- Hex decoding validation (simulates
Base16Codec.decode) - Content integrity verification
Validated SDK Versions
| SDK | Version | Status |
|---|---|---|
| AWS SDK v2 for Go | 1.20+ | ✅ Tested |
| AWS SDK v2 for Java | 2.20+ | ✅ Compatible (issue #7768 fixed) |
| AWS SDK v1 for Go | 1.x | ✅ Compatible (less strict validation) |
| AWS SDK v1 for Java | 1.x | ✅ Compatible (less strict validation) |