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

Print/log pointers of structs with %#v instead of %+v

Browse Source 
There are many places in k8s where %+v is used to format a pointer
to struct, which isn't working as expected.

Fixes #26591
This commit is contained in:
Michal Rostecki
2016-06-14 14:04:38 +02:00
parent ed763b8034
commit 59ca5986dd
35 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/deployment/deployment_controller.go
View File

@@ -229,12 +229,12 @@ func (dc *DeploymentController) deleteDeploymentNotification(obj interface{}) {
if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
glog.Errorf("Couldn't get object from tombstone %+v", obj)
glog.Errorf("Couldn't get object from tombstone %#v", obj)
return
}
d, ok = tombstone.Obj.(*extensions.Deployment)
if !ok {
glog.Errorf("Tombstone contained object that is not a Deployment %+v", obj)
glog.Errorf("Tombstone contained object that is not a Deployment %#v", obj)
return
}
}
@@ -305,12 +305,12 @@ func (dc *DeploymentController) deleteReplicaSet(obj interface{}) {
if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
glog.Errorf("Couldn't get object from tombstone %+v, could take up to %v before a deployment recreates/updates replicasets", obj, FullDeploymentResyncPeriod)
glog.Errorf("Couldn't get object from tombstone %#v, could take up to %v before a deployment recreates/updates replicasets", obj, FullDeploymentResyncPeriod)
return
}
rs, ok = tombstone.Obj.(*extensions.ReplicaSet)
if !ok {
glog.Errorf("Tombstone contained object that is not a ReplicaSet %+v, could take up to %v before a deployment recreates/updates replicasets", obj, FullDeploymentResyncPeriod)
glog.Errorf("Tombstone contained object that is not a ReplicaSet %#v, could take up to %v before a deployment recreates/updates replicasets", obj, FullDeploymentResyncPeriod)
return
}
}
@@ -344,7 +344,7 @@ func (dc *DeploymentController) addPod(obj interface{}) {
if !ok {
return
}
glog.V(4).Infof("Pod %s created: %+v.", pod.Name, pod)
glog.V(4).Infof("Pod %s created: %#v.", pod.Name, pod)
if d := dc.getDeploymentForPod(pod); d != nil {
dc.enqueueDeployment(d)
}
@@ -382,16 +382,16 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
glog.Errorf("Couldn't get object from tombstone %+v", obj)
glog.Errorf("Couldn't get object from tombstone %#v", obj)
return
}
pod, ok = tombstone.Obj.(*api.Pod)
if !ok {
glog.Errorf("Tombstone contained object that is not a pod %+v", obj)
glog.Errorf("Tombstone contained object that is not a pod %#v", obj)
return
}
}
glog.V(4).Infof("Pod %s deleted: %+v.", pod.Name, pod)
glog.V(4).Infof("Pod %s deleted: %#v.", pod.Name, pod)
if d := dc.getDeploymentForPod(pod); d != nil {
dc.enqueueDeployment(d)
}
@@ -400,7 +400,7 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
func (dc *DeploymentController) enqueueDeployment(deployment *extensions.Deployment) {
key, err := controller.KeyFunc(deployment)
if err != nil {
glog.Errorf("Couldn't get key for object %+v: %v", deployment, err)
glog.Errorf("Couldn't get key for object %#v: %v", deployment, err)
return
}

6
pkg/controller/deployment/util/deployment_util_test.go
View File

@@ -286,7 +286,7 @@ func TestGetNewRC(t *testing.T) {
t.Errorf("In test case %s, got unexpected error %v", test.test, err)
}
if !api.Semantic.DeepEqual(rs, test.expected) {
t.Errorf("In test case %s, expected %+v, got %+v", test.test, test.expected, rs)
t.Errorf("In test case %s, expected %#v, got %#v", test.test, test.expected, rs)
}
}
}
@@ -381,11 +381,11 @@ func TestGetOldRCs(t *testing.T) {
if !equal(rss, test.expected) {
t.Errorf("In test case %q, expected:", test.test)
for _, rs := range test.expected {
t.Errorf("rs = %+v", rs)
t.Errorf("rs = %#v", rs)
}
t.Errorf("In test case %q, got:", test.test)
for _, rs := range rss {
t.Errorf("rs = %+v", rs)
t.Errorf("rs = %#v", rs)
}
}
}