Skip to content

[pull] main from containerd:main #95

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
pull merged 2 commits into from
Sep 2, 2025
Merged

[pull] main from containerd:main #95

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683cd7d
gc:make sure lastCollection is not nil
ningmingxiao Aug 5, 2025
f4dfa99
Merge pull request #12168 from ningmingxiao/fix_lastCollection
mxpv Sep 2, 2025
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
12 changes: 9 additions & 3 deletions plugins/gc/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,15 @@ func (s *gcScheduler) run(ctx context.Context) {
if err != nil {
log.G(ctx).WithError(err).Error("garbage collection failed")
collectionCounter.WithValues("fail").Inc()

// Reschedule garbage collection for same duration + 1 second
schedC, nextCollection = schedule(nextCollection.Sub(*lastCollection) + time.Second)
var retryDelay time.Duration
if lastCollection != nil {
// If we have a previous collection time, reschedule based on that interval.
retryDelay = nextCollection.Sub(*lastCollection) + time.Second
} else {
// If this is the first collection and it failed, use the default schedule delay.
retryDelay = s.scheduleDelay
}
schedC, nextCollection = schedule(retryDelay)

// Update last collection time even though failure occurred
lastCollection = &last
Expand Down
Loading