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

fix: satisfy integrated server verifiers

Browse Source 
Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-11-11 11:40:24 +08:00
parent 5dc4bd6a1d
commit 62b8784428
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/auth-handler.go
-10
View File
@@ -340,16 +340,6 @@ func checkRequestAuthType(ctx context.Context, r *http.Request, action policy.Ac
return s3Err return s3Err
} }
func checkRequestAuthTypeWithExistingTags(ctx context.Context, r *http.Request, action policy.Action, bucketName, objectName, existingTags string) (s3Err APIErrorCode) {
logger.GetReqInfo(ctx).BucketName = bucketName
logger.GetReqInfo(ctx).ObjectName = objectName
if s3Err = authenticateRequest(ctx, r, action); s3Err != ErrNone {
return s3Err
}
return authorizeRequestWithExistingTags(ctx, r, action, existingTags)
}
func checkRequestAuthTypeWithRequestTags(ctx context.Context, r *http.Request, action policy.Action, bucketName, objectName string, requestTags *string) (s3Err APIErrorCode) { func checkRequestAuthTypeWithRequestTags(ctx context.Context, r *http.Request, action policy.Action, bucketName, objectName string, requestTags *string) (s3Err APIErrorCode) {
logger.GetReqInfo(ctx).BucketName = bucketName logger.GetReqInfo(ctx).BucketName = bucketName
logger.GetReqInfo(ctx).ObjectName = objectName logger.GetReqInfo(ctx).ObjectName = objectName
cmd/erasure-server-pool-decom.go
+2 -2
View File
@@ -1059,12 +1059,12 @@ func (z *erasureServerPools) decommissionPoolWalk(ctx context.Context, idx int,
// One metadata-only read of each source drive per entry, regardless // One metadata-only read of each source drive per entry, regardless
// of its version count. No read error can become progress or trigger // of its version count. No read error can become progress or trigger
// another walk; leave the bucket queued for an explicit retry. // another walk; leave the bucket queued for an explicit retry.
snapshot := append(fivs.Versions, fivs.FreeVersions...) snapshot := slices.Concat(fivs.Versions, fivs.FreeVersions)
n, countErr := z.countAbsentMigrationVersions(ctx, bi.Name, entry.name, idx, snapshot) n, countErr := z.countAbsentMigrationVersions(ctx, bi.Name, entry.name, idx, snapshot)
removed.Add(int64(n)) removed.Add(int64(n))
// The disposable usage cache is also excluded by the final // The disposable usage cache is also excluded by the final
// verification. Its unreadability still never counts as progress. // verification. Its unreadability still never counts as progress.
if countErr != nil && !(bi.Name == minioMetaBucket && strings.Contains(entry.name, dataUsageCacheName)) { if countErr != nil && (bi.Name != minioMetaBucket || !strings.Contains(entry.name, dataUsageCacheName)) {
verifyOnce.Do(func() { verifyErr = countErr }) verifyOnce.Do(func() { verifyErr = countErr })
if err == nil { if err == nil {
err = countErr err = countErr
cmd/object-lock-reconciliation_test.go
+2
View File
@@ -327,12 +327,14 @@ func (f *lockBoundaryReadFailure) GetObjectNInfo(ctx context.Context, bucket, ke
} }
return f.ObjectLayer.GetObjectNInfo(ctx, bucket, key, rs, h, opts) return f.ObjectLayer.GetObjectNInfo(ctx, bucket, key, rs, h, opts)
} }
func (f *lockBoundaryReadFailure) GetObjectInfo(ctx context.Context, bucket, key string, opts ObjectOptions) (ObjectInfo, error) { func (f *lockBoundaryReadFailure) GetObjectInfo(ctx context.Context, bucket, key string, opts ObjectOptions) (ObjectInfo, error) {
if f.destinationError != nil && bucket == f.bucket && key == f.key && opts.VersionID == f.version { if f.destinationError != nil && bucket == f.bucket && key == f.key && opts.VersionID == f.version {
return ObjectInfo{}, f.destinationError return ObjectInfo{}, f.destinationError
} }
return f.ObjectLayer.GetObjectInfo(ctx, bucket, key, opts) return f.ObjectLayer.GetObjectInfo(ctx, bucket, key, opts)
} }
func (f *lockBoundaryReadFailure) DeleteObject(ctx context.Context, bucket, key string, opts ObjectOptions) (ObjectInfo, error) { func (f *lockBoundaryReadFailure) DeleteObject(ctx context.Context, bucket, key string, opts ObjectOptions) (ObjectInfo, error) {
f.deleteCalls++ f.deleteCalls++
return f.ObjectLayer.DeleteObject(ctx, bucket, key, opts) return f.ObjectLayer.DeleteObject(ctx, bucket, key, opts)