Skip to content

Commit

Permalink
Merge pull request kubernetes#19970 from liggitt/quiet-apiserver-logs
Browse files Browse the repository at this point in the history
UPSTREAM: 65001: Quiet verbose apiserver logs

Origin-commit: b0ba202a287acf2ef6b77a9de8cfb3c6adaa369d
  • Loading branch information
k8s-publishing-bot committed Jun 12, 2018
2 parents 48a0815 + 3e00fcf commit 41b65b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/endpoints/handlers/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
if timeout == 0 && minRequestTimeout > 0 {
timeout = time.Duration(float64(minRequestTimeout) * (rand.Float64() + 1.0))
}
glog.V(2).Infof("Starting watch for %s, rv=%s labels=%s fields=%s timeout=%s", req.URL.Path, opts.ResourceVersion, opts.LabelSelector, opts.FieldSelector, timeout)
glog.V(3).Infof("Starting watch for %s, rv=%s labels=%s fields=%s timeout=%s", req.URL.Path, opts.ResourceVersion, opts.LabelSelector, opts.FieldSelector, timeout)

watcher, err := rw.Watch(ctx, &opts)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func (wc *watchChan) processEvent(wg *sync.WaitGroup) {
continue
}
if len(wc.resultChan) == outgoingBufSize {
glog.Warningf("Fast watcher, slow processing. Number of buffered events: %d."+
glog.V(3).Infof("Fast watcher, slow processing. Number of buffered events: %d."+
"Probably caused by slow dispatching events to watchers", outgoingBufSize)
}
// If user couldn't receive results fast enough, we also block incoming events from watcher.
Expand Down Expand Up @@ -339,7 +339,7 @@ func (wc *watchChan) sendError(err error) {

func (wc *watchChan) sendEvent(e *event) {
if len(wc.incomingEventChan) == incomingBufSize {
glog.Warningf("Fast watcher, slow processing. Number of buffered events: %d."+
glog.V(3).Infof("Fast watcher, slow processing. Number of buffered events: %d."+
"Probably caused by slow decoding, user not receiving fast, or other processing logic",
incomingBufSize)
}
Expand Down

0 comments on commit 41b65b1

Please sign in to comment.