astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-11-03 06:12:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269 from botdeniska/fix/lifecycle-active-delmarker-expiration

Browse Source 
Merge lifecycle fix: count DelMarkerExpiration as an active scanner rule.
This commit is contained in:
Feng Ruohang
2026-11-03 08:23:22 +08:00
committed by GitHub
parent 0fc5a0b527 a803027b09
commit d4e7716085
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/bucket/lifecycle/lifecycle.go
+3
View File
@@ -208,6 +208,9 @@ func (lc Lifecycle) HasActiveRules(prefix string) bool {
if rule.Expiration.DeleteMarker.val {
return true
}
if !rule.DelMarkerExpiration.Empty() {
return true
}
if !rule.Transition.IsDateNull() && rule.Transition.Date.Before(time.Now().UTC()) {
return true
}
internal/bucket/lifecycle/lifecycle_test.go
+20
View File
@@ -819,6 +819,26 @@ func TestHasActiveRules(t *testing.T) {
prefix: "",
want: true,
},
{ // DelMarkerExpiration as the only action
inputConfig: `<LifecycleConfiguration><Rule><Status>Enabled</Status><Filter></Filter><DelMarkerExpiration><Days>1</Days></DelMarkerExpiration></Rule></LifecycleConfiguration>`,
prefix: "",
want: true,
},
{
inputConfig: `<LifecycleConfiguration><Rule><Status>Enabled</Status><Filter><Prefix>foodir/</Prefix></Filter><DelMarkerExpiration><Days>1</Days></DelMarkerExpiration></Rule></LifecycleConfiguration>`,
prefix: "foodir/foobject",
want: true,
},
{
inputConfig: `<LifecycleConfiguration><Rule><Status>Enabled</Status><Filter><Prefix>foodir/</Prefix></Filter><DelMarkerExpiration><Days>1</Days></DelMarkerExpiration></Rule></LifecycleConfiguration>`,
prefix: "zdir/foobject",
want: false,
},
{
inputConfig: `<LifecycleConfiguration><Rule><Status>Disabled</Status><Filter></Filter><DelMarkerExpiration><Days>1</Days></DelMarkerExpiration></Rule></LifecycleConfiguration>`,
prefix: "",
want: false,
},
}
for i, tc := range testCases {