Merge pull request #39413 from zdj6373/cinder

Automatic merge from submit-queue (batch tested with PRs 39433, 39413) "Attach" function records information collation In the "attach" function, the log information, for the variable "instanceid", has been described as "node", as well as recorded as "instance", recorded as "instance" should be better.

Merge pull request #39413 from zdj6373/cinder
5503e5e6 · Kubernetes Submit Queue · GitHub · 13780bba · 84316ad5 · 5503e5e6
Commit 5503e5e6 authored Jan 05, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

attacher.go pkg/volume/cinder/attacher.go +4 -4

No files found.
--- a/pkg/volume/cinder/attacher.go
+++ b/pkg/volume/cinder/attacher.go
@@ -83,17 +83,17 @@ func (attacher *cinderDiskAttacher) Attach(spec *volume.Spec, nodeName types.Nod
 	if err != nil {
 		// Log error and continue with attach
 		glog.Warningf(
-			"Error checking if volume (%q) is already attached to current node (%q). Will continue and try attach anyway. err=%v",
+			"Error checking if volume (%q) is already attached to current instance (%q). Will continue and try attach anyway. err=%v",
 			volumeID, instanceid, err)
 	}
 	if err == nil && attached {
-		// Volume is already attached to node.
+		// Volume is already attached to instance.
-		glog.Infof("Attach operation is successful. volume %q is already attached to node %q.", volumeID, instanceid)
+		glog.Infof("Attach operation is successful. volume %q is already attached to instance %q.", volumeID, instanceid)
 	} else {
 		_, err = attacher.cinderProvider.AttachDisk(instanceid, volumeID)
 		if err == nil {
-			glog.Infof("Attach operation successful: volume %q attached to node %q.", volumeID, instanceid)
+			glog.Infof("Attach operation successful: volume %q attached to instance %q.", volumeID, instanceid)
 		} else {
 			glog.Infof("Attach volume %q to instance %q failed with %v", volumeID, instanceid, err)
 			return "", err