mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-09-30 11:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3: collapse suspended-versioning deletes onto one null marker (#9845)

Browse Source 
A suspended-versioning DELETE was recorded with createDeleteMarker, which mints a
fresh real version id each time, so repeated suspended deletes piled up delete
markers instead of overwriting a single null marker as S3 specifies. Record the
suspended delete as a 'null' marker with a fixed file name (v_null) and point the
latest-version pointer at it explicitly; putSuspendedVersioningObject's existing
null-version cleanup removes it on the next suspended PUT, so the object undeletes
cleanly and at most one null marker exists. Enabled-versioning deletes are
unchanged (still distinct historical markers).

Update TestSuspendedVersioningDeleteBehavior to the AWS-correct counts: one null
marker after a suspended delete, and the null marker plus one real marker after a
re-enabled delete.
This commit is contained in:
Chris Lu
2026-06-06 20:49:38 -07:00
committed by GitHub
parent fa9bf58c86
commit d321f9efb4
3 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/s3/versioning/s3_directory_versioning_test.go
+19 -7
View File
@@ -543,12 +543,12 @@ func TestSuspendedVersioningDeleteBehavior(t *testing.T) {
})
require.NoError(t, err)
assert.Len(t, listResp.Versions, 3, "Should be back to 3 versions after deleting null version")
// A suspended-versioning DELETE removes the null version and records a delete
// marker so the object reads as deleted (without one, an older version would
// resurface). AWS keeps a single null marker that overwrites; SeaweedFS does
// not yet collapse to one (suspended-marker id/dedup is tracked separately),
// so assert the invariant - a marker is recorded - rather than an exact count.
assert.NotEmpty(t, listResp.DeleteMarkers, "Suspended delete should record a delete marker")
// A suspended-versioning DELETE removes the null version and records a single
// null delete marker that overwrites any prior one (S3 spec), so the object
// reads as deleted without markers piling up.
require.Len(t, listResp.DeleteMarkers, 1, "Suspended delete should record exactly one null delete marker")
assert.Equal(t, "null", aws.ToString(listResp.DeleteMarkers[0].VersionId), "Suspended delete marker should have version id null")
assert.Equal(t, objectKey, aws.ToString(listResp.DeleteMarkers[0].Key), "Delete marker should be for the deleted object")
// Verify null version is gone
nullVersionFound = false
@@ -609,7 +609,19 @@ func TestSuspendedVersioningDeleteBehavior(t *testing.T) {
})
require.NoError(t, err)
assert.Len(t, listResp.Versions, 4, "Should have 3 original versions + 1 new version")
assert.NotEmpty(t, listResp.DeleteMarkers, "Re-enabled delete should record a delete marker")
// The historical null suspended marker plus the new enabled-mode delete marker.
require.Len(t, listResp.DeleteMarkers, 2, "Should have the null suspended marker and the enabled-mode delete marker")
var sawNull, sawEnabled bool
for _, dm := range listResp.DeleteMarkers {
assert.Equal(t, objectKey, aws.ToString(dm.Key), "Delete marker should be for the deleted object")
if aws.ToString(dm.VersionId) == "null" {
sawNull = true
} else {
sawEnabled = true
}
}
assert.True(t, sawNull, "Suspended phase should leave a null delete marker")
assert.True(t, sawEnabled, "Enabled delete should add a real-version-id delete marker")
t.Logf("Successfully verified suspended versioning delete behavior")
}