github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24452 from a-robinson/dpv

Browse Source 
Fix gce.getDiskByNameUnknownZone logic.
This commit is contained in:
Alex Robinson
2016-04-19 11:58:04 -07:00
parent c9c2a252f6 d69ccd5c8c
commit 23a8401c32
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cloudprovider/providers/gce/gce.go
View File

@@ -2245,6 +2245,11 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
if err != nil { if err != nil {
return nil, err 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 { if found != nil {
return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName) return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName)
} }