MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-20 18:44:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unused debug param from evalActionFromLifecycle (#15813)

Browse Source
This commit is contained in:
Harshavardhana 2022-10-07 10:24:12 -07:00 committed by GitHub
parent b3febe2d24
commit 928feb0889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/data-scanner.go
View File

@ -960,7 +960,7 @@ func (i *scannerItem) applyLifecycle(ctx context.Context, o ObjectLayer, oi Obje
versionID := oi.VersionID versionID := oi.VersionID
rCfg, _ := globalBucketObjectLockSys.Get(i.bucket) rCfg, _ := globalBucketObjectLockSys.Get(i.bucket)
action := evalActionFromLifecycle(ctx, *i.lifeCycle, rCfg, oi, false) action := evalActionFromLifecycle(ctx, *i.lifeCycle, rCfg, oi)
if i.debug { if i.debug {
if versionID != "" { if versionID != "" {
console.Debugf(applyActionsLogPrefix+" lifecycle: %q (version-id=%s), Initial scan: %v\n", i.objectPath(), versionID, action) console.Debugf(applyActionsLogPrefix+" lifecycle: %q (version-id=%s), Initial scan: %v\n", i.objectPath(), versionID, action)
@ -1106,9 +1106,9 @@ func (i *scannerItem) applyActions(ctx context.Context, o ObjectLayer, oi Object
return size return size
} }
func evalActionFromLifecycle(ctx context.Context, lc lifecycle.Lifecycle, lr lock.Retention, obj ObjectInfo, debug bool) (action lifecycle.Action) { func evalActionFromLifecycle(ctx context.Context, lc lifecycle.Lifecycle, lr lock.Retention, obj ObjectInfo) (action lifecycle.Action) {
action = lc.ComputeAction(obj.ToLifecycleOpts()) action = lc.ComputeAction(obj.ToLifecycleOpts())
if debug { if serverDebugLog {
console.Debugf(applyActionsLogPrefix+" lifecycle: Secondary scan: %v\n", action) console.Debugf(applyActionsLogPrefix+" lifecycle: Secondary scan: %v\n", action)
} }
@ -1123,7 +1123,7 @@ func evalActionFromLifecycle(ctx context.Context, lc lifecycle.Lifecycle, lr loc
return lifecycle.NoneAction return lifecycle.NoneAction
} }
if lr.LockEnabled && enforceRetentionForDeletion(ctx, obj) { if lr.LockEnabled && enforceRetentionForDeletion(ctx, obj) {
if debug { if serverDebugLog {
if obj.VersionID != "" { if obj.VersionID != "" {
console.Debugf(applyActionsLogPrefix+" lifecycle: %s v(%s) is locked, not deleting\n", obj.Name, obj.VersionID) console.Debugf(applyActionsLogPrefix+" lifecycle: %s v(%s) is locked, not deleting\n", obj.Name, obj.VersionID)
} else { } else {

2
cmd/erasure-object.go
View File

@ -1530,7 +1530,7 @@ func (er erasureObjects) DeleteObject(ctx context.Context, bucket, object string
if opts.Expiration.Expire { if opts.Expiration.Expire {
goi, _, err := er.getObjectInfoAndQuorum(ctx, bucket, object, opts) goi, _, err := er.getObjectInfoAndQuorum(ctx, bucket, object, opts)
if err == nil { if err == nil {
action := evalActionFromLifecycle(ctx, *lc, rcfg, goi, false) action := evalActionFromLifecycle(ctx, *lc, rcfg, goi)
var isErr bool var isErr bool
switch action { switch action {
case lifecycle.NoneAction: case lifecycle.NoneAction:

2
cmd/erasure-server-pool-decom.go
View File

@ -701,7 +701,7 @@ func (z *erasureServerPools) decommissionPool(ctx context.Context, idx int, pool
} }
versioned := vc != nil && vc.Versioned(object) versioned := vc != nil && vc.Versioned(object)
objInfo := fi.ToObjectInfo(bucket, object, versioned) objInfo := fi.ToObjectInfo(bucket, object, versioned)
action := evalActionFromLifecycle(ctx, *lc, lr, objInfo, false) action := evalActionFromLifecycle(ctx, *lc, lr, objInfo)
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
globalExpiryState.enqueueByDays(objInfo, false, action == lifecycle.DeleteVersionAction) globalExpiryState.enqueueByDays(objInfo, false, action == lifecycle.DeleteVersionAction)

2
cmd/erasure-server-pool.go
View File

@ -1302,7 +1302,7 @@ func (z *erasureServerPools) ListObjects(ctx context.Context, bucket, prefix, ma
objInfo, err := z.GetObjectInfo(ctx, bucket, prefix, ObjectOptions{NoLock: true}) objInfo, err := z.GetObjectInfo(ctx, bucket, prefix, ObjectOptions{NoLock: true})
if err == nil { if err == nil {
if opts.Lifecycle != nil { if opts.Lifecycle != nil {
action := evalActionFromLifecycle(ctx, *opts.Lifecycle, opts.Retention, objInfo, false) action := evalActionFromLifecycle(ctx, *opts.Lifecycle, opts.Retention, objInfo)
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
fallthrough fallthrough

4
cmd/erasure-single-drive.go
View File

@ -1465,7 +1465,7 @@ func (es *erasureSingle) DeleteObject(ctx context.Context, bucket, object string
} }
if opts.Expiration.Expire { if opts.Expiration.Expire {
action := evalActionFromLifecycle(ctx, *lc, rcfg, goi, false) action := evalActionFromLifecycle(ctx, *lc, rcfg, goi)
var isErr bool var isErr bool
switch action { switch action {
case lifecycle.NoneAction: case lifecycle.NoneAction:
@ -2897,7 +2897,7 @@ func (es *erasureSingle) ListObjects(ctx context.Context, bucket, prefix, marker
objInfo, err := es.GetObjectInfo(ctx, bucket, prefix, ObjectOptions{NoLock: true}) objInfo, err := es.GetObjectInfo(ctx, bucket, prefix, ObjectOptions{NoLock: true})
if err == nil { if err == nil {
if opts.Lifecycle != nil { if opts.Lifecycle != nil {
action := evalActionFromLifecycle(ctx, *opts.Lifecycle, opts.Retention, objInfo, false) action := evalActionFromLifecycle(ctx, *opts.Lifecycle, opts.Retention, objInfo)
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
fallthrough fallthrough

2
cmd/metacache-server-pool.go
View File

@ -625,7 +625,7 @@ func applyBucketActions(ctx context.Context, o listPathOptions, in <-chan metaCa
objInfo := fi.ToObjectInfo(o.Bucket, obj.name, versioned) objInfo := fi.ToObjectInfo(o.Bucket, obj.name, versioned)
if o.Lifecycle != nil { if o.Lifecycle != nil {
action := evalActionFromLifecycle(ctx, *o.Lifecycle, o.Retention, objInfo, false) action := evalActionFromLifecycle(ctx, *o.Lifecycle, o.Retention, objInfo)
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
globalExpiryState.enqueueByDays(objInfo, false, action == lifecycle.DeleteVersionAction) globalExpiryState.enqueueByDays(objInfo, false, action == lifecycle.DeleteVersionAction)

4
cmd/object-handlers.go
View File

@ -495,7 +495,7 @@ func (api objectAPIHandlers) getObjectHandler(ctx context.Context, objectAPI Obj
// Automatically remove the object/version is an expiry lifecycle rule can be applied // Automatically remove the object/version is an expiry lifecycle rule can be applied
if lc, err := globalLifecycleSys.Get(bucket); err == nil { if lc, err := globalLifecycleSys.Get(bucket); err == nil {
rcfg, _ := globalBucketObjectLockSys.Get(bucket) rcfg, _ := globalBucketObjectLockSys.Get(bucket)
action := evalActionFromLifecycle(ctx, *lc, rcfg, objInfo, false) action := evalActionFromLifecycle(ctx, *lc, rcfg, objInfo)
var success bool var success bool
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction:
@ -735,7 +735,7 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
// Automatically remove the object/version is an expiry lifecycle rule can be applied // Automatically remove the object/version is an expiry lifecycle rule can be applied
if lc, err := globalLifecycleSys.Get(bucket); err == nil { if lc, err := globalLifecycleSys.Get(bucket); err == nil {
rcfg, _ := globalBucketObjectLockSys.Get(bucket) rcfg, _ := globalBucketObjectLockSys.Get(bucket)
action := evalActionFromLifecycle(ctx, *lc, rcfg, objInfo, false) action := evalActionFromLifecycle(ctx, *lc, rcfg, objInfo)
var success bool var success bool
switch action { switch action {
case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: case lifecycle.DeleteVersionAction, lifecycle.DeleteAction: