github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88360 from andyzhangx/delete-disk

Browse Source 
fix: check disk status before delete azure disk
This commit is contained in:
Kubernetes Prow Robot
2020-02-24 06:42:47 -08:00
committed by GitHub
parent 20e3288277 44e6a506b9
commit e4a5012de6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go
View File

@@ -214,7 +214,16 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error {
return fmt.Errorf("failed to delete disk(%s) since it's in attaching or detaching state", diskURI)
}
rerr := c.common.cloud.DisksClient.Delete(ctx, resourceGroup, diskName)
disk, rerr := c.common.cloud.DisksClient.Get(ctx, resourceGroup, diskName)
if rerr != nil {
return rerr.Error()
}
if disk.ManagedBy != nil {
return fmt.Errorf("disk(%s) already attached to node(%s), could not be deleted", diskURI, *disk.ManagedBy)
}
rerr = c.common.cloud.DisksClient.Delete(ctx, resourceGroup, diskName)
if rerr != nil {
return rerr.Error()
}