Merge pull request #26777 from jsafrane/fix-attach-errors

Automatic merge from submit-queue Fix GCE attacher/detacher to ignore return value of failed calls. The plugin should ignore any return value if err is set. Found when writing unit tests in #26615 - my dummy `DiskIsAttached` returned `false, errors.New('fake error')` and the volume was **not** detached although the log message `"Error checking if PD (%q) is already attached to current node (%q). Will continue and try detach anyway."` suggested otherwise @saad-ali, PTAL @kubernetes/sig-storage

Merge pull request #26777 from jsafrane/fix-attach-errors
14f27637 · k8s-merge-robot · 15b382be · eb5a6831 · 14f27637
Commit 14f27637 authored Jun 03, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

attacher.go pkg/volume/gce_pd/attacher.go +2 -2

No files found.
--- a/pkg/volume/gce_pd/attacher.go
+++ b/pkg/volume/gce_pd/attacher.go
@@ -76,7 +76,7 @@ func (attacher *gcePersistentDiskAttacher) Attach(spec *volume.Spec, hostName st
 			pdName, hostName, err)
 	}
-	if attached {
+	if err == nil && attached {
 		// Volume is already attached to node.
 		glog.Infof("Attach operation is successful. PD %q is already attached to node %q.", pdName, hostName)
 		return nil
@@ -198,7 +198,7 @@ func (detacher *gcePersistentDiskDetacher) Detach(deviceMountPath string, hostNa
 			pdName, hostName, err)
 	}
-	if !attached {
+	if err == nil && !attached {
 		// Volume is not attached to node. Success!
 		glog.Infof("Detach operation is successful. PD %q was not attached to node %q.", pdName, hostName)
 		return nil