Merge pull request #24452 from a-robinson/dpv

Fix gce.getDiskByNameUnknownZone logic.
This commit is contained in:
Alex Robinson 2016-04-19 11:58:04 -07:00
commit 23a8401c32

View File

@ -2245,6 +2245,11 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
if err != nil {
return nil, err
}
// findDiskByName returns (nil,nil) if the disk doesn't exist, so we can't
// assume that a disk was found unless disk is non-nil.
if disk == nil {
continue
}
if found != nil {
return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName)
}