dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-10 01:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12168 from ningmingxiao/fix_lastCollection

Browse Source 
gc:make sure lastCollection is not nil
This commit is contained in:
Maksym Pavlenko
2025-09-02 00:15:10 +00:00
committed by GitHub
parent 0ed21e1c7d 683cd7d60d
commit f4dfa9968b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/gc/scheduler.go
View File

@@ -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