mirror of
https://github.com/minio/minio.git
synced 2024-12-24 22:25:54 -05:00
rebalance 'null' delete markers properly (#17282)
This commit is contained in:
parent
54c5c88fe6
commit
5cd9dcb844
@ -506,25 +506,29 @@ func (z *erasureServerPools) rebalanceBucket(ctx context.Context, bucket string,
|
||||
|
||||
// Apply lifecycle rules on the objects that are expired.
|
||||
if filterLifecycle(bucket, version.Name, version) {
|
||||
logger.LogIf(ctx, fmt.Errorf("found %s/%s (%s) expired object based on ILM rules, skipping and scheduled for deletion", bucket, version.Name, version.VersionID))
|
||||
rebalanced++
|
||||
continue
|
||||
}
|
||||
|
||||
// We will skip rebalancing delete markers
|
||||
// with single version, its as good as there
|
||||
// is no data associated with the object.
|
||||
// Empty delete markers we can assume that they can be purged
|
||||
// as there is no more data associated with them.
|
||||
if version.Deleted && len(fivs.Versions) == 1 {
|
||||
logger.LogIf(ctx, fmt.Errorf("found %s/%s delete marked object with no other versions, skipping since there is no data to be rebalanced", bucket, version.Name))
|
||||
rebalanced++
|
||||
continue
|
||||
}
|
||||
|
||||
versionID := version.VersionID
|
||||
if versionID == "" {
|
||||
versionID = nullVersionID
|
||||
}
|
||||
|
||||
if version.Deleted {
|
||||
_, err := z.DeleteObject(ctx,
|
||||
bucket,
|
||||
version.Name,
|
||||
ObjectOptions{
|
||||
Versioned: vc.PrefixEnabled(version.Name),
|
||||
VersionID: version.VersionID,
|
||||
Versioned: true,
|
||||
VersionID: versionID,
|
||||
MTime: version.ModTime,
|
||||
DeleteReplication: version.ReplicationState,
|
||||
DeleteMarker: true, // make sure we create a delete marker
|
||||
@ -552,7 +556,7 @@ func (z *erasureServerPools) rebalanceBucket(ctx context.Context, bucket string,
|
||||
nil,
|
||||
http.Header{},
|
||||
ObjectOptions{
|
||||
VersionID: version.VersionID,
|
||||
VersionID: versionID,
|
||||
NoDecryption: true,
|
||||
NoLock: true,
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user