Skip to content

test(jobs): drive expiry/reaper coverage to 95% #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mastermanas805 merged 2 commits into from
May 22, 2026
Merged

test(jobs): drive expiry/reaper coverage to 95% #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e521b0
test(jobs): drive expiry/reaper coverage to 95%
mastermanas805 May 22, 2026
21acf06
fix(jobs): race on objectCount in deleteStorageObjects
mastermanas805 May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions internal/jobs/expire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"log/slog"
"strings"
"sync/atomic"
"time"

madmin "github.com/minio/madmin-go/v3"
Expand Down Expand Up @@ -570,7 +571,11 @@ func deleteStorageObjects(ctx context.Context, deleter S3BackupDeleter, bucket,
// with thousands of objects doesn't pull the whole listing into memory —
// the same pipe pattern as team_deletion_executor.deleteS3BackupsForToken.
objectsCh := make(chan minio.ObjectInfo, 32)
var objectCount int
// objectCount is incremented in the producer goroutine below and read
// after the RemoveObjects drain loop on the consumer side — use an
// atomic so the cross-goroutine read in the final slog is race-free
// (the -race build flagged the plain-int read otherwise).
var objectCount atomic.Int64
go func() {
defer close(objectsCh)
defer func() {
Expand All @@ -591,7 +596,7 @@ func deleteStorageObjects(ctx context.Context, deleter S3BackupDeleter, bucket,
)
return
}
objectCount++
objectCount.Add(1)
select {
case objectsCh <- obj:
case <-ctx.Done():
Expand All @@ -617,7 +622,7 @@ func deleteStorageObjects(ctx context.Context, deleter S3BackupDeleter, bucket,
"resource_id", resourceID,
"token", logsafe.Token(token),
"prefix", prefix,
"objects_listed", objectCount,
"objects_listed", objectCount.Load(),
"remove_errors", removeErrors,
"job_id", jobID,
)
Expand Down
Loading
Loading