MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-01 02:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: deletion of delete marker regression (#11465)

Browse Source 
fixes #11440
fixes #11451
fixes #11454
This commit is contained in:
Harshavardhana 2021-02-05 15:06:23 -08:00 committed by GitHub
parent b4ac05523b
commit 99b733d44c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/xl-storage-format-v2.go
View File

@ -708,40 +708,40 @@ func (z xlMetaV2) ToFileInfo(volume, path, versionID string) (fi FileInfo, err e
return FileInfo{}, errFileNotFound return FileInfo{}, errFileNotFound
} }
var i = -1 var foundIndex = -1
var version xlMetaV2Version
findVersion: for i := range orderedVersions {
for i, version = range orderedVersions { switch orderedVersions[i].Type {
switch version.Type {
case ObjectType: case ObjectType:
if bytes.Equal(version.ObjectV2.VersionID[:], uv[:]) { if bytes.Equal(orderedVersions[i].ObjectV2.VersionID[:], uv[:]) {
fi, err = version.ObjectV2.ToFileInfo(volume, path) fi, err = orderedVersions[i].ObjectV2.ToFileInfo(volume, path)
break findVersion foundIndex = i
break
} }
case LegacyType: case LegacyType:
if version.ObjectV1.VersionID == versionID { if orderedVersions[i].ObjectV1.VersionID == versionID {
fi, err = version.ObjectV1.ToFileInfo(volume, path) fi, err = orderedVersions[i].ObjectV1.ToFileInfo(volume, path)
break findVersion foundIndex = i
break
} }
case DeleteType: case DeleteType:
if bytes.Equal(version.DeleteMarker.VersionID[:], uv[:]) { if bytes.Equal(orderedVersions[i].DeleteMarker.VersionID[:], uv[:]) {
fi, err = version.DeleteMarker.ToFileInfo(volume, path) fi, err = orderedVersions[i].DeleteMarker.ToFileInfo(volume, path)
break findVersion foundIndex = i
break
} }
} }
} }
if err != nil { if err != nil {
return fi, err return fi, err
} }
if i >= 0 { if foundIndex >= 0 {
// A version is found, fill dynamic fields // A version is found, fill dynamic fields
fi.IsLatest = i == 0 fi.IsLatest = foundIndex == 0
fi.NumVersions = len(z.Versions) fi.NumVersions = len(z.Versions)
if i > 0 { if foundIndex > 0 {
fi.SuccessorModTime = getModTimeFromVersion(orderedVersions[i-1]) fi.SuccessorModTime = getModTimeFromVersion(orderedVersions[foundIndex-1])
} }
return fi, nil return fi, nil
} }