github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36051 from zdj6373/server-log

Browse Source 
Automatic merge from submit-queue

improve and modify log

1, the content of a unified writing, compared to the following line of failure (314th lines)
2, “instance” should be “node”
This commit is contained in:
Kubernetes Submit Queue 2016-11-08 02:52:38 -08:00 committed by GitHub
commit 6c5e0269d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubelet/app/server.go
View File

@ -309,7 +309,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
done := make(chan struct{}) done := make(chan struct{})
if s.LockFilePath != "" { if s.LockFilePath != "" {
glog.Infof("acquiring lock on %q", s.LockFilePath) glog.Infof("acquiring file lock on %q", s.LockFilePath)
if err := flock.Acquire(s.LockFilePath); err != nil { if err := flock.Acquire(s.LockFilePath); err != nil {
return fmt.Errorf("unable to acquire file lock on %q: %v", s.LockFilePath, err) return fmt.Errorf("unable to acquire file lock on %q: %v", s.LockFilePath, err)
} }
@ -500,7 +500,7 @@ func getNodeName(cloud cloudprovider.Interface, hostname string) (types.NodeName
nodeName, err := instances.CurrentNodeName(hostname) nodeName, err := instances.CurrentNodeName(hostname)
if err != nil { if err != nil {
return "", fmt.Errorf("error fetching current instance name from cloud provider: %v", err) return "", fmt.Errorf("error fetching current node name from cloud provider: %v", err)
} }
glog.V(2).Infof("cloud provider determined current node name to be %s", nodeName) glog.V(2).Infof("cloud provider determined current node name to be %s", nodeName)