github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78700 from andyzhangx/azuredisk-detach-retry

Browse Source 
fix: retry detach azure disk issue
This commit is contained in:
Kubernetes Prow Robot 2019-06-07 05:12:00 -07:00 committed by GitHub
commit 59594523c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ limitations under the License.
package azure package azure
import ( import (
"fmt"
"net/http" "net/http"
"strings" "strings"
@ -132,7 +131,8 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
} }
if !bFoundDisk { if !bFoundDisk {
return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI) // only log here, next action is to update VM status with original meta data
klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI)
} }
newVM := compute.VirtualMachine{ newVM := compute.VirtualMachine{

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

@ -17,7 +17,6 @@ limitations under the License.
package azure package azure
import ( import (
"fmt"
"net/http" "net/http"
"strings" "strings"
@ -136,7 +135,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
} }
if !bFoundDisk { if !bFoundDisk {
return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI) // only log here, next action is to update VM status with original meta data
klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI)
} }
newVM := compute.VirtualMachineScaleSetVM{ newVM := compute.VirtualMachineScaleSetVM{