github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #32100 from wojtek-t/fix_rc_log 

Automatic merge from submit-queue

Fix debugging log in RC

Ref #31981
pull/6/head
Kubernetes Submit Queue 2016-09-06 00:38:51 -07:00 committed by GitHub
parent 0c8b17891b 5582856e23
commit 065fad7ad1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/replication/replication_controller.go
View File

@ -320,7 +320,7 @@ func (rm *ReplicationManager) updateRC(old, cur interface{}) {
rm.lookupCache.InvalidateAll() rm.lookupCache.InvalidateAll()
} }
// TODO: Remove when #31981 is resolved! // TODO: Remove when #31981 is resolved!
glog.Infof("Observed updated replication controller %v. Pod count change: %d->%d", curRC.Name, oldRC.Status.Replicas, curRC.Status.Replicas) glog.Infof("Observed updated replication controller %v. Desired pod count change: %d->%d", curRC.Name, oldRC.Spec.Replicas, curRC.Spec.Replicas)
// You might imagine that we only really need to enqueue the // You might imagine that we only really need to enqueue the
// controller when Spec changes, but it is safer to sync any // controller when Spec changes, but it is safer to sync any
@ -335,6 +335,7 @@ func (rm *ReplicationManager) updateRC(old, cur interface{}) {
// that bad as rcs that haven't met expectations yet won't // that bad as rcs that haven't met expectations yet won't
// sync, and all the listing is done using local stores. // sync, and all the listing is done using local stores.
if oldRC.Status.Replicas != curRC.Status.Replicas { if oldRC.Status.Replicas != curRC.Status.Replicas {
// TODO: Should we log status or spec?
glog.V(4).Infof("Observed updated replica count for rc: %v, %d->%d", curRC.Name, oldRC.Status.Replicas, curRC.Status.Replicas) glog.V(4).Infof("Observed updated replica count for rc: %v, %d->%d", curRC.Name, oldRC.Status.Replicas, curRC.Status.Replicas)
} }
rm.enqueueController(cur) rm.enqueueController(cur)