Skip to content

K
k3s
Commit eb5a6831 authored by Jan Safranek's avatar Jan Safranek
Browse files
Options

Fix GCE attacher/detacher to ignore return value of failed calls.

The plugin should ignore any return value if err is set.
parent 3157e87c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/volume/gce_pd/attacher.go
View file @ eb5a6831
......@@ -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
......
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