listing: Expire object versions past expiry (#15287)

We skip object versions which are past their ILM expiry. This change schedules
them for expiry while at it.
This commit is contained in:
Krishnan Parthasarathi 2022-07-14 07:21:26 -07:00 committed by GitHub
parent df911c9b9e
commit 1d42133d44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -667,8 +667,11 @@ func filterLifeCycle(ctx context.Context, bucket string, lc lifecycle.Lifecycle,
action := evalActionFromLifecycle(ctx, lc, lr, objInfo, false) action := evalActionFromLifecycle(ctx, lc, lr, objInfo, false)
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
fallthrough globalExpiryState.enqueueByDays(objInfo, false, action == lifecycle.DeleteVersionAction)
// Skip this entry.
continue
case lifecycle.DeleteRestoredAction, lifecycle.DeleteRestoredVersionAction: case lifecycle.DeleteRestoredAction, lifecycle.DeleteRestoredVersionAction:
globalExpiryState.enqueueByDays(objInfo, true, action == lifecycle.DeleteRestoredVersionAction)
// Skip this entry. // Skip this entry.
continue continue
} }