github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125190 from pohly/record-event-panic

Browse Source 
client-go record: avoid panic when watch creation failed
This commit is contained in:
Kubernetes Prow Robot
2024-05-29 06:20:33 -07:00
committed by GitHub
parent 529896474f 080432c46a
commit ea0ab06b69
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/tools/record/event.go
View File

@@ -395,7 +395,11 @@ func (e *eventBroadcasterImpl) StartStructuredLogging(verbosity klog.Level) watc
func (e *eventBroadcasterImpl) StartEventWatcher(eventHandler func(*v1.Event)) watch.Interface { func (e *eventBroadcasterImpl) StartEventWatcher(eventHandler func(*v1.Event)) watch.Interface {
watcher, err := e.Watch() watcher, err := e.Watch()
if err != nil { if err != nil {
// This function traditionally returns no error even though it can fail.
// Instead, it logs the error and returns an empty watch. The empty
// watch ensures that callers don't crash when calling Stop.
klog.FromContext(e.cancelationCtx).Error(err, "Unable start event watcher (will not retry!)") klog.FromContext(e.cancelationCtx).Error(err, "Unable start event watcher (will not retry!)")
return watch.NewEmptyWatch()
} }
go func() { go func() {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()