github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: use force detach for azure disk

Browse Source 
revert attach disk change

revert some change

fix: should not filter out disk in attach azure disk
This commit is contained in:
andyzhangx 2020-06-09 14:24:21 +00:00
parent cf36d9b8e9
commit 3f9ca0a320
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go
View File

@ -44,7 +44,8 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
return err return err
} }
disks := filterDetachingDisks(*vm.StorageProfile.DataDisks) disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
if isManagedDisk { if isManagedDisk {
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI} managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
@ -131,7 +132,8 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
return err return err
} }
disks := filterDetachingDisks(*vm.StorageProfile.DataDisks) disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
bFoundDisk := false bFoundDisk := false
for i, disk := range disks { for i, disk := range disks {
@ -140,7 +142,7 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
(disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) { (disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) {
// found the disk // found the disk
klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI) klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI)
disks = append(disks[:i], disks[i+1:]...) disks[i].ToBeDetached = to.BoolPtr(true)
bFoundDisk = true bFoundDisk = true
break break
} }

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go
View File

@ -46,7 +46,8 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
disks := []compute.DataDisk{} disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil { if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = filterDetachingDisks(*vm.StorageProfile.DataDisks) disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
} }
if isManagedDisk { if isManagedDisk {
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI} managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
@ -136,7 +137,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
disks := []compute.DataDisk{} disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil { if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = filterDetachingDisks(*vm.StorageProfile.DataDisks) disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
} }
bFoundDisk := false bFoundDisk := false
for i, disk := range disks { for i, disk := range disks {
@ -145,7 +147,7 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
(disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) { (disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) {
// found the disk // found the disk
klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI) klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI)
disks = append(disks[:i], disks[i+1:]...) disks[i].ToBeDetached = to.BoolPtr(true)
bFoundDisk = true bFoundDisk = true
break break
} }