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

Integrate complete native restore repair after R2 cleanup safety

Browse Source 
Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-11-03 21:20:24 +08:00
parent 18ba0ef32a fa42a09826
commit fcbf2c7d49
5 changed files with 778 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/object-handlers.go
+8 -5
View File
@@ -4008,8 +4008,9 @@ func (api objectAPIHandlers) PostRestoreObjectHandler(w http.ResponseWriter, r *
if _, err := objectAPI.CopyObject(GlobalContext, bucket, object, bucket, object, objInfo, ObjectOptions{
VersionID: objInfo.VersionID,
}, ObjectOptions{
VersionID: objInfo.VersionID,
MTime: objInfo.ModTime,
VersionID: objInfo.VersionID,
MTime: objInfo.ModTime,
MetadataChg: true,
}); err != nil {
writeErrorResponse(ctx, w, errorCodes.ToAPIErr(ErrInvalidObjectState), r.URL)
return
@@ -4082,14 +4083,16 @@ func (api objectAPIHandlers) PostRestoreObjectHandler(w http.ResponseWriter, r *
rreq.SelectParameters.Close()
return
}
opts := ObjectOptions{
restoreOpts := ObjectOptions{
Transition: TransitionOptions{
RestoreRequest: rreq,
RestoreExpiry: restoreExpiry,
},
VersionID: objInfo.VersionID,
VersionID: objInfo.VersionID,
Versioned: opts.Versioned,
VersionSuspended: opts.VersionSuspended,
}
if err := objectAPI.RestoreTransitionedObject(rctx, bucket, object, opts); err != nil {
if err := objectAPI.RestoreTransitionedObject(rctx, bucket, object, restoreOpts); err != nil {
s3LogIf(ctx, fmt.Errorf("Unable to restore transitioned bucket/object %s/%s: %w", bucket, object, err))
return
}