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

Merge pull request #37273 from brendandburns/race

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39199, 37273, 29183, 39638, 40199)

Add a log at the start of a watch request.

Fixes https://github.com/kubernetes/kubernetes/issues/16899  (> than a year old!)

@lavalamp
This commit is contained in:
Kubernetes Submit Queue
2017-01-23 00:30:13 -08:00
committed by GitHub
parent c08758e95d 2f2d1b6620
commit 5c5b901611
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/genericapiserver/endpoints/handlers/rest.go
View File

@@ -302,6 +302,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
} }
if (opts.Watch || forceWatch) && rw != nil { if (opts.Watch || forceWatch) && rw != nil {
glog.Infof("Started to log from %v for %v", ctx, req.Request.URL.RequestURI())
watcher, err := rw.Watch(ctx, &opts) watcher, err := rw.Watch(ctx, &opts)
if err != nil { if err != nil {
scope.err(err, res.ResponseWriter, req.Request) scope.err(err, res.ResponseWriter, req.Request)