github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99195 from pacoxu/structurelog/watch-retry-timeout-1

Browse Source 
migrate "client-go retry-watcher watch" to structured logging
This commit is contained in:
Kubernetes Prow Robot 2021-02-23 20:56:50 -08:00 committed by GitHub
commit f41aeffffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/client-go/tools/watch/retrywatcher.go
View File

@ -116,24 +116,24 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
return false, 0
case io.ErrUnexpectedEOF:
klog.V(1).Infof("Watch closed with unexpected EOF: %v", err)
klog.V(1).InfoS("Watch closed with unexpected EOF", "err", err)
return false, 0
default:
msg := "Watch failed: %v"
msg := "Watch failed"
if net.IsProbableEOF(err) || net.IsTimeout(err) {
klog.V(5).Infof(msg, err)
klog.V(5).InfoS(msg, "err", err)
// Retry
return false, 0
}
klog.Errorf(msg, err)
klog.ErrorS(err, msg)
// Retry
return false, 0
}
if watcher == nil {
klog.Error("Watch returned nil watcher")
klog.ErrorS(nil, "Watch returned nil watcher")
// Retry
return false, 0
}
@ -144,11 +144,11 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
for {
select {
case <-rw.stopChan:
klog.V(4).Info("Stopping RetryWatcher.")
klog.V(4).InfoS("Stopping RetryWatcher.")
return true, 0
case event, ok := <-ch:
if !ok {
klog.V(4).Infof("Failed to get event! Re-creating the watcher. Last RV: %s", rw.lastResourceVersion)
klog.V(4).InfoS("Failed to get event! Re-creating the watcher.", "resourceVersion", rw.lastResourceVersion)
return false, 0
}