Browse Source
fix: multipart upload ETag calculation (#8238)
fix: multipart upload ETag calculation (#8238)
* 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.master
Chris Lu
15 hours ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 479 additions and 111 deletions
-
2.github/workflows/helm_ci.yml
-
104test/s3/etag/s3_etag_test.go
-
74test/s3tables/table-buckets/s3tables_integration_test.go
-
5weed/admin/view/app/maintenance_queue.templ
-
6weed/admin/view/app/maintenance_queue_templ.go
-
3weed/filer/filechunks.go
-
7weed/operation/upload_chunked.go
-
94weed/s3api/filer_multipart.go
-
167weed/s3api/s3api_etag_quoting_test.go
-
18weed/s3api/s3api_object_handlers.go
-
45weed/s3api/s3api_object_handlers_list.go
-
21weed/s3api/s3api_object_handlers_put.go
-
20weed/s3api/s3api_object_handlers_test.go
-
3weed/s3api/s3api_object_versioning.go
-
11weed/server/filer_server_handlers_write_upload.go
-
1weed/server/volume_server_handlers_write.go
-
9weed/storage/needle/needle_parse_upload.go
@ -0,0 +1,167 @@ |
|||
package s3api |
|||
|
|||
import ( |
|||
"fmt" |
|||
"testing" |
|||
"time" |
|||
|
|||
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" |
|||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" |
|||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err" |
|||
) |
|||
|
|||
// TestReproIfMatchMismatch tests specifically for the scenario where internal ETag
|
|||
// is unquoted (common in SeaweedFS) but client sends quoted ETag in If-Match.
|
|||
func TestReproIfMatchMismatch(t *testing.T) { |
|||
bucket := "test-bucket" |
|||
object := "/test-key" |
|||
etagValue := "37b51d194a7513e45b56f6524f2d51f2" |
|||
|
|||
// Scenario 1: Internal ETag is UNQUOTED (stored in Extended), Client sends QUOTED If-Match
|
|||
// This mirrors the behavior we enforced in filer_multipart.go
|
|||
t.Run("UnquotedInternal_QuotedHeader", func(t *testing.T) { |
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key", |
|||
Extended: map[string][]byte{ |
|||
s3_constants.ExtETagKey: []byte(etagValue), // Unquoted
|
|||
}, |
|||
Attributes: &filer_pb.FuseAttributes{ |
|||
Mtime: time.Now().Unix(), |
|||
FileSize: 1024, |
|||
}, |
|||
} |
|||
|
|||
getter := &MockEntryGetter{mockEntry: entry} |
|||
req := createTestGetRequest(bucket, object) |
|||
// Client sends quoted ETag
|
|||
req.Header.Set(s3_constants.IfMatch, "\""+etagValue+"\"") |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
result := s3a.checkConditionalHeadersForReadsWithGetter(getter, req, bucket, object) |
|||
|
|||
if result.ErrorCode != s3err.ErrNone { |
|||
t.Errorf("Expected success (ErrNone) for unquoted internal ETag and quoted header, got %v. Internal ETag: %s", result.ErrorCode, string(entry.Extended[s3_constants.ExtETagKey])) |
|||
} |
|||
}) |
|||
|
|||
// Scenario 2: Internal ETag is QUOTED (stored in Extended), Client sends QUOTED If-Match
|
|||
// This handles legacy or mixed content
|
|||
t.Run("QuotedInternal_QuotedHeader", func(t *testing.T) { |
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key", |
|||
Extended: map[string][]byte{ |
|||
s3_constants.ExtETagKey: []byte("\"" + etagValue + "\""), // Quoted
|
|||
}, |
|||
Attributes: &filer_pb.FuseAttributes{ |
|||
Mtime: time.Now().Unix(), |
|||
FileSize: 1024, |
|||
}, |
|||
} |
|||
|
|||
getter := &MockEntryGetter{mockEntry: entry} |
|||
req := createTestGetRequest(bucket, object) |
|||
req.Header.Set(s3_constants.IfMatch, "\""+etagValue+"\"") |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
result := s3a.checkConditionalHeadersForReadsWithGetter(getter, req, bucket, object) |
|||
|
|||
if result.ErrorCode != s3err.ErrNone { |
|||
t.Errorf("Expected success (ErrNone) for quoted internal ETag and quoted header, got %v", result.ErrorCode) |
|||
} |
|||
}) |
|||
|
|||
// Scenario 3: Internal ETag is from Md5 (QUOTED by getObjectETag), Client sends QUOTED If-Match
|
|||
t.Run("Md5Internal_QuotedHeader", func(t *testing.T) { |
|||
// Mock Md5 attribute (16 bytes)
|
|||
md5Bytes := make([]byte, 16) |
|||
copy(md5Bytes, []byte("1234567890123456")) // This doesn't match the hex string below, but getObjectETag formats it as hex
|
|||
|
|||
// Expected ETag from Md5 is hex string of bytes
|
|||
expectedHex := fmt.Sprintf("%x", md5Bytes) |
|||
|
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key", |
|||
Attributes: &filer_pb.FuseAttributes{ |
|||
Mtime: time.Now().Unix(), |
|||
FileSize: 1024, |
|||
Md5: md5Bytes, |
|||
}, |
|||
} |
|||
|
|||
getter := &MockEntryGetter{mockEntry: entry} |
|||
req := createTestGetRequest(bucket, object) |
|||
req.Header.Set(s3_constants.IfMatch, "\""+expectedHex+"\"") |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
result := s3a.checkConditionalHeadersForReadsWithGetter(getter, req, bucket, object) |
|||
|
|||
if result.ErrorCode != s3err.ErrNone { |
|||
t.Errorf("Expected success (ErrNone) for Md5 internal ETag and quoted header, got %v", result.ErrorCode) |
|||
} |
|||
}) |
|||
|
|||
// Test getObjectETag specifically ensuring it returns quoted strings
|
|||
t.Run("getObjectETag_ShouldReturnQuoted", func(t *testing.T) { |
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key", |
|||
Extended: map[string][]byte{ |
|||
s3_constants.ExtETagKey: []byte("unquoted-etag"), |
|||
}, |
|||
} |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
etag := s3a.getObjectETag(entry) |
|||
|
|||
expected := "\"unquoted-etag\"" |
|||
if etag != expected { |
|||
t.Errorf("Expected quoted ETag %s, got %s", expected, etag) |
|||
} |
|||
}) |
|||
|
|||
// Test getObjectETag fallback when Extended ETag is present but empty
|
|||
t.Run("getObjectETag_EmptyExtended_ShouldFallback", func(t *testing.T) { |
|||
md5Bytes := []byte("1234567890123456") |
|||
expectedHex := fmt.Sprintf("\"%x\"", md5Bytes) |
|||
|
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key-fallback", |
|||
Extended: map[string][]byte{ |
|||
s3_constants.ExtETagKey: []byte(""), // Present but empty
|
|||
}, |
|||
Attributes: &filer_pb.FuseAttributes{ |
|||
Mtime: time.Now().Unix(), |
|||
FileSize: 1024, |
|||
Md5: md5Bytes, |
|||
}, |
|||
} |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
etag := s3a.getObjectETag(entry) |
|||
|
|||
if etag != expectedHex { |
|||
t.Errorf("Expected fallback ETag %s, got %s", expectedHex, etag) |
|||
} |
|||
}) |
|||
|
|||
// Test newListEntry ETag behavior
|
|||
t.Run("newListEntry_ShouldReturnQuoted", func(t *testing.T) { |
|||
entry := &filer_pb.Entry{ |
|||
Name: "test-key", |
|||
Extended: map[string][]byte{ |
|||
s3_constants.ExtETagKey: []byte("unquoted-etag"), |
|||
}, |
|||
Attributes: &filer_pb.FuseAttributes{ |
|||
Mtime: time.Now().Unix(), |
|||
FileSize: 1024, |
|||
}, |
|||
} |
|||
|
|||
s3a := NewS3ApiServerForTest() |
|||
listEntry := newListEntry(s3a, entry, "", "bucket/dir", "test-key", "bucket/", false, false, false) |
|||
|
|||
expected := "\"unquoted-etag\"" |
|||
if listEntry.ETag != expected { |
|||
t.Errorf("Expected quoted ETag %s, got %s", expected, listEntry.ETag) |
|||
} |
|||
}) |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue