github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-21 09:34:40 +00:00
Code Issues Projects Releases Wiki Activity

garbagecollector: fix logs & comments in gc sync

Browse Source 
Signed-off-by: haorenfsa <haorenfsa@gmail.com>
This commit is contained in:
haorenfsa 2024-09-13 22:53:22 +08:00
parent 87ca404634
commit da5f6cf053
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/garbagecollector/garbagecollector.go
View File

@ -149,7 +149,7 @@ func (gc *GarbageCollector) Run(ctx context.Context, workers int, initialSyncTim
if !cache.WaitForNamedCacheSync("garbage collector", waitForStopOrTimeout(ctx.Done(), initialSyncTimeout), func() bool { if !cache.WaitForNamedCacheSync("garbage collector", waitForStopOrTimeout(ctx.Done(), initialSyncTimeout), func() bool {
return gc.dependencyGraphBuilder.IsSynced(logger) return gc.dependencyGraphBuilder.IsSynced(logger)
}) { }) {
logger.Info("Garbage collector: all resource monitors could not be synced, proceeding anyways") logger.Info("Garbage collector: not all resource monitors could be synced, proceeding anyways")
} else { } else {
logger.Info("Garbage collector: all resource monitors have synced") logger.Info("Garbage collector: all resource monitors have synced")
} }
@ -227,14 +227,13 @@ func (gc *GarbageCollector) Sync(ctx context.Context, discoveryClient discovery.
} }
logger.V(4).Info("resynced monitors") logger.V(4).Info("resynced monitors")
// wait for caches to fill for a while (our sync period) before attempting to rediscover resources and retry syncing. // gc worker no longer waits for cache to be synced, but we will keep the periodical check to provide logs & metrics
// this protects us from deadlocks where available resources changed and one of our informer caches will never fill. cacheSynced := cache.WaitForNamedCacheSync("garbage collector", waitForStopOrTimeout(ctx.Done(), period), func() bool {
// informers keep attempting to sync in the background, so retrying doesn't interrupt them.
// the call to resyncMonitors on the reattempt will no-op for resources that still exist.
// note that workers stay paused until we successfully resync.
if !cache.WaitForNamedCacheSync("garbage collector", waitForStopOrTimeout(ctx.Done(), period), func() bool {
return gc.dependencyGraphBuilder.IsSynced(logger) return gc.dependencyGraphBuilder.IsSynced(logger)
}) { })
if cacheSynced {
logger.V(2).Info("synced garbage collector")
} else {
utilruntime.HandleError(fmt.Errorf("timed out waiting for dependency graph builder sync during GC sync")) utilruntime.HandleError(fmt.Errorf("timed out waiting for dependency graph builder sync during GC sync"))
metrics.GarbageCollectorResourcesSyncError.Inc() metrics.GarbageCollectorResourcesSyncError.Inc()
} }
@ -243,7 +242,6 @@ func (gc *GarbageCollector) Sync(ctx context.Context, discoveryClient discovery.
// Monitors where the cache sync times out are still tracked here as // Monitors where the cache sync times out are still tracked here as
// subsequent runs should stop them if their resources were removed. // subsequent runs should stop them if their resources were removed.
oldResources = newResources oldResources = newResources
logger.V(2).Info("synced garbage collector")
}, period) }, period)
} }