Skip to content

K
k3s
Commit 6c5e0269 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36051 from zdj6373/server-log

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”
parents ece94c31 cc39354a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmd/kubelet/app/server.go
View file @ 6c5e0269
......@@ -309,7 +309,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
done := make(chan struct{})
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 {
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)
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment