github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Use Infof/Warningf when appropriate

Browse Source 
When we use a format string, we should use Infof/Warningf instead
of Info/Warning
This commit is contained in:
Davanum Srinivas 2016-07-19 12:10:50 -04:00
parent d9fbb9f600
commit ee8507a5ae
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/scheduler/components/framework/framework.go
View File

@ -548,7 +548,7 @@ func (k *framework) reconcileTerminalTask(driver bindings.SchedulerDriver, taskS
//is unrecognized by the master at this point, so KillTask is not guaranteed //is unrecognized by the master at this point, so KillTask is not guaranteed
//to do anything. The underlying driver transport may be able to send a //to do anything. The underlying driver transport may be able to send a
//FrameworkMessage directly to the slave to terminate the task. //FrameworkMessage directly to the slave to terminate the task.
log.V(2).Info("forwarding TASK_LOST message to executor %v on slave %v", taskStatus.ExecutorId, taskStatus.SlaveId) log.V(2).Infof("forwarding TASK_LOST message to executor %v on slave %v", taskStatus.ExecutorId, taskStatus.SlaveId)
data := fmt.Sprintf("%s:%s", messages.TaskLost, task.ID) //TODO(jdef) use a real message type data := fmt.Sprintf("%s:%s", messages.TaskLost, task.ID) //TODO(jdef) use a real message type
if _, err := driver.SendFrameworkMessage(taskStatus.ExecutorId, taskStatus.SlaveId, data); err != nil { if _, err := driver.SendFrameworkMessage(taskStatus.ExecutorId, taskStatus.SlaveId, data); err != nil {
log.Error(err.Error()) log.Error(err.Error())

2
contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
View File

@ -76,7 +76,7 @@ func (s *podReconciler) Reconcile(t *podtask.T) {
} else { } else {
//TODO(jdef) other errors should probably trigger a retry (w/ backoff). //TODO(jdef) other errors should probably trigger a retry (w/ backoff).
//For now, drop the pod on the floor //For now, drop the pod on the floor
log.Warning("aborting reconciliation for pod %v: %v", t.Pod.Name, err) log.Warningf("aborting reconciliation for pod %v: %v", t.Pod.Name, err)
} }
return return
} }

2
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1413,7 +1413,7 @@ func (c *Cloud) DetachDisk(diskName string, instanceName string) (string, error)
} }
if !alreadyAttached { if !alreadyAttached {
glog.Warning("DetachDisk called on non-attached disk: %s", diskName) glog.Warningf("DetachDisk called on non-attached disk: %s", diskName)
// TODO: Continue? Tolerate non-attached error in DetachVolume? // TODO: Continue? Tolerate non-attached error in DetachVolume?
} }

4
pkg/cloudprovider/providers/vsphere/vsphere.go
View File

@ -434,9 +434,9 @@ func (i *Instances) InstanceID(name string) (string, error) {
} }
if mvm.Summary.Config.Template == false { if mvm.Summary.Config.Template == false {
glog.Warning("VM %s, is not in %s state", name, ActivePowerState) glog.Warningf("VM %s, is not in %s state", name, ActivePowerState)
} else { } else {
glog.Warning("VM %s, is a template", name) glog.Warningf("VM %s, is a template", name)
} }
return "", cloudprovider.InstanceNotFound return "", cloudprovider.InstanceNotFound

2
pkg/dns/dns.go
View File

@ -247,7 +247,7 @@ func (kd *KubeDNS) newService(obj interface{}) {
return return
} }
if len(service.Spec.Ports) == 0 { if len(service.Spec.Ports) == 0 {
glog.Warning("Unexpected service with no ports, this should not have happend: %v", service) glog.Warningf("Unexpected service with no ports, this should not have happend: %v", service)
} }
kd.newPortalService(service) kd.newPortalService(service)
} }

2
plugin/pkg/scheduler/factory/factory.go
View File

@ -539,7 +539,7 @@ func (factory *ConfigFactory) makeDefaultErrorFunc(backoff *podBackoff, podQueue
break break
} }
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
glog.Warning("A pod %v no longer exists", podID) glog.Warningf("A pod %v no longer exists", podID)
return return
} }
glog.Errorf("Error getting pod %v for retry: %v; retrying...", podID, err) glog.Errorf("Error getting pod %v for retry: %v; retrying...", podID, err)

2
test/integration/persistentvolumes/persistent_volumes_test.go
View File

@ -246,7 +246,7 @@ func TestPersistentVolumeBindRace(t *testing.T) {
newPvc.ObjectMeta = api.ObjectMeta{Name: fmt.Sprintf("fake-pvc-race-%d", counter)} newPvc.ObjectMeta = api.ObjectMeta{Name: fmt.Sprintf("fake-pvc-race-%d", counter)}
claim, err := testClient.PersistentVolumeClaims(ns.Name).Create(newPvc) claim, err := testClient.PersistentVolumeClaims(ns.Name).Create(newPvc)
if err != nil { if err != nil {
t.Fatal("Error creating newPvc: %v", err) t.Fatalf("Error creating newPvc: %v", err)
} }
claims = append(claims, claim) claims = append(claims, claim)
} }

2
vendor/github.com/google/cadvisor/devicemapper/thin_ls_client.go generated vendored
View File

@ -80,7 +80,7 @@ func parseThinLsOutput(output []byte) map[string]uint64 {
deviceID := fields[0] deviceID := fields[0]
usage, err := strconv.ParseUint(fields[1], 10, 64) usage, err := strconv.ParseUint(fields[1], 10, 64)
if err != nil { if err != nil {
glog.Warning("unexpected error parsing thin_ls output: %v", err) glog.Warningf("unexpected error parsing thin_ls output: %v", err)
continue continue
} }

2
vendor/github.com/mesos/mesos-go/executor/executor.go generated vendored
View File

@ -292,7 +292,7 @@ func (driver *MesosExecutorDriver) recoveryTimedOut(connection string) {
} }
// ensure that connection ID's match otherwise we've been re-registered // ensure that connection ID's match otherwise we've been re-registered
if connection == driver.connection.String() { if connection == driver.connection.String() {
log.Info("recovery timeout of %v exceeded; shutting down", driver.recoveryTimeout) log.Infof("recovery timeout of %v exceeded; shutting down", driver.recoveryTimeout)
driver.shutdown(driver.context(), nil, nil) driver.shutdown(driver.context(), nil, nil)
} }
} }