From 12f50d37fa52444a43ad6ff4cc3d156db4035528 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 19 Jul 2025 21:43:34 -0700 Subject: test versioning also (#7000) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test versioning also * fix some versioning tests * fall back * fixes Never-versioned buckets: No VersionId headers, no Status field Pre-versioning objects: Regular files, VersionId="null", included in all operations Post-versioning objects: Stored in .versions directories with real version IDs Suspended versioning: Proper status handling and null version IDs * fixes Bucket Versioning Status Compliance Fixed: New buckets now return no Status field (AWS S3 compliant) Before: Always returned "Suspended" ❌ After: Returns empty VersioningConfiguration for unconfigured buckets ✅ 2. Multi-Object Delete Versioning Support Fixed: DeleteMultipleObjectsHandler now fully versioning-aware Before: Always deleted physical files, breaking versioning ❌ After: Creates delete markers or deletes specific versions properly ✅ Added: DeleteMarker field in response structure for AWS compatibility 3. Copy Operations Versioning Support Fixed: CopyObjectHandler and CopyObjectPartHandler now versioning-aware Before: Only copied regular files, couldn't handle versioned sources ❌ After: Parses version IDs from copy source, creates versions in destination ✅ Added: pathToBucketObjectAndVersion() function for version ID parsing 4. Pre-versioning Object Handling Fixed: getLatestObjectVersion() now has proper fallback logic Before: Failed when .versions directory didn't exist ❌ After: Falls back to regular objects for pre-versioning scenarios ✅ 5. Enhanced Object Version Listings Fixed: listObjectVersions() includes both versioned AND pre-versioning objects Before: Only showed .versions directories, ignored pre-versioning objects ❌ After: Shows complete version history with VersionId="null" for pre-versioning ✅ 6. Null Version ID Handling Fixed: getSpecificObjectVersion() properly handles versionId="null" Before: Couldn't retrieve pre-versioning objects by version ID ❌ After: Returns regular object files for "null" version requests ✅ 7. Version ID Response Headers Fixed: PUT operations only return x-amz-version-id when appropriate Before: Returned version IDs for non-versioned buckets ❌ After: Only returns version IDs for explicitly configured versioning ✅ * more fixes * fix copying with versioning, multipart upload * more fixes * reduce volume size for easier dev test * fix * fix version id * fix versioning * Update filer_multipart.go * fix multipart versioned upload * more fixes * more fixes * fix versioning on suspended * fixes * fixing test_versioning_obj_suspended_copy * Update s3api_object_versioning.go * fix versions * skipping test_versioning_obj_suspend_versions * > If the versioning state has never been set on a bucket, it has no versioning state; a GetBucketVersioning request does not return a versioning state value. * fix tests, avoid duplicated bucket creation, skip tests * only run s3tests_boto3/functional/test_s3.py * fix checking filer_pb.ErrNotFound * Update weed/s3api/s3api_object_versioning.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update weed/s3api/s3api_object_handlers_copy.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update weed/s3api/s3api_bucket_config.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update test/s3/versioning/s3_versioning_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- docker/compose/local-clusters-compose.yml | 4 ++-- docker/compose/local-filer-backup-compose.yml | 4 ++-- docker/compose/local-minio-gateway-compose.yml | 2 +- docker/compose/local-registry-compose.yml | 2 +- docker/compose/test-etcd-filer.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/compose/local-clusters-compose.yml b/docker/compose/local-clusters-compose.yml index 314133312..62b1c5d4d 100644 --- a/docker/compose/local-clusters-compose.yml +++ b/docker/compose/local-clusters-compose.yml @@ -10,7 +10,7 @@ services: - 18084:18080 - 8888:8888 - 18888:18888 - command: "server -ip=server1 -filer -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1" + command: "server -ip=server1 -filer -volume.max=0 -master.volumeSizeLimitMB=100 -volume.preStopSeconds=1" volumes: - ./master-cloud.toml:/etc/seaweedfs/master.toml depends_on: @@ -25,4 +25,4 @@ services: - 8889:8888 - 18889:18888 - 8334:8333 - command: "server -ip=server2 -filer -s3 -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1" + command: "server -ip=server2 -filer -s3 -volume.max=0 -master.volumeSizeLimitMB=100 -volume.preStopSeconds=1" diff --git a/docker/compose/local-filer-backup-compose.yml b/docker/compose/local-filer-backup-compose.yml index 3e4baf5fa..3e56e624d 100644 --- a/docker/compose/local-filer-backup-compose.yml +++ b/docker/compose/local-filer-backup-compose.yml @@ -3,7 +3,7 @@ version: '3.9' services: server-left: image: chrislusf/seaweedfs:local - command: "-v=0 server -ip=server-left -filer -filer.maxMB 5 -s3 -s3.config=/etc/seaweedfs/s3.json -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1" + command: "-v=0 server -ip=server-left -filer -filer.maxMB 5 -s3 -s3.config=/etc/seaweedfs/s3.json -volume.max=0 -master.volumeSizeLimitMB=100 -volume.preStopSeconds=1" volumes: - ./s3.json:/etc/seaweedfs/s3.json healthcheck: @@ -13,7 +13,7 @@ services: timeout: 30s server-right: image: chrislusf/seaweedfs:local - command: "-v=0 server -ip=server-right -filer -filer.maxMB 64 -s3 -s3.config=/etc/seaweedfs/s3.json -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1" + command: "-v=0 server -ip=server-right -filer -filer.maxMB 64 -s3 -s3.config=/etc/seaweedfs/s3.json -volume.max=0 -master.volumeSizeLimitMB=100 -volume.preStopSeconds=1" volumes: - ./s3.json:/etc/seaweedfs/s3.json healthcheck: diff --git a/docker/compose/local-minio-gateway-compose.yml b/docker/compose/local-minio-gateway-compose.yml index 13c662e5f..179ea1630 100644 --- a/docker/compose/local-minio-gateway-compose.yml +++ b/docker/compose/local-minio-gateway-compose.yml @@ -6,7 +6,7 @@ services: ports: - 9333:9333 - 19333:19333 - command: "master -ip=master -volumeSizeLimitMB=1024" + command: "master -ip=master -volumeSizeLimitMB=100" volume: image: chrislusf/seaweedfs:local ports: diff --git a/docker/compose/local-registry-compose.yml b/docker/compose/local-registry-compose.yml index 9b66bcb40..3aa056a90 100644 --- a/docker/compose/local-registry-compose.yml +++ b/docker/compose/local-registry-compose.yml @@ -6,7 +6,7 @@ services: ports: - 9333:9333 - 19333:19333 - command: "master -ip=master -volumeSizeLimitMB=1024" + command: "master -ip=master -volumeSizeLimitMB=100" volume: image: chrislusf/seaweedfs:local ports: diff --git a/docker/compose/test-etcd-filer.yml b/docker/compose/test-etcd-filer.yml index a856b9e14..c6f24c559 100644 --- a/docker/compose/test-etcd-filer.yml +++ b/docker/compose/test-etcd-filer.yml @@ -11,7 +11,7 @@ services: ports: - 9333:9333 - 19333:19333 - command: "master -ip=master -volumeSizeLimitMB=1024" + command: "master -ip=master -volumeSizeLimitMB=100" volume: image: chrislusf/seaweedfs:local ports: -- cgit v1.2.3