MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't add free-version on restore-object (#14340)

Browse Source
This commit is contained in:
Krishnan Parthasarathi 2022-02-17 15:05:19 -08:00 committed by GitHub
parent af8f563ed3
commit 5a0c0079a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/erasure-metadata.go
View File

@ -477,6 +477,18 @@ func (fi *FileInfo) TierFreeVersion() bool {
return ok return ok
} }
// IsRestoreObjReq returns true if fi corresponds to a RestoreObject request.
func (fi *FileInfo) IsRestoreObjReq() bool {
if restoreHdr, ok := fi.Metadata[xhttp.AmzRestore]; ok {
if restoreStatus, err := parseRestoreObjStatus(restoreHdr); err == nil {
if !restoreStatus.Ongoing() {
return true
}
}
}
return false
}
// VersionPurgeStatus returns overall version purge status for this object version across targets // VersionPurgeStatus returns overall version purge status for this object version across targets
func (fi *FileInfo) VersionPurgeStatus() VersionPurgeStatusType { func (fi *FileInfo) VersionPurgeStatus() VersionPurgeStatusType {
return fi.ReplicationState.CompositeVersionPurgeStatus() return fi.ReplicationState.CompositeVersionPurgeStatus()

6
cmd/xl-storage.go
View File

@ -2241,8 +2241,14 @@ func (s *xlStorage) RenameData(ctx context.Context, srcVolume, srcPath string, f
// suspended or disabled on this bucket. RenameData will replace // suspended or disabled on this bucket. RenameData will replace
// the 'null' version. We add a free-version to track its tiered // the 'null' version. We add a free-version to track its tiered
// content for asynchronous deletion. // content for asynchronous deletion.
if !fi.IsRestoreObjReq() {
// Note: Restore object request reuses PutObject/Multipart
// upload to copy back its data from the remote tier. This
// doesn't replace the existing version, so we don't need to add
// a free-version.
xlMeta.AddFreeVersion(fi) xlMeta.AddFreeVersion(fi)
} }
}
// indicates if RenameData() is called by healing. // indicates if RenameData() is called by healing.
// healing doesn't preserve the dataDir as 'legacy' // healing doesn't preserve the dataDir as 'legacy'