mirror of https://github.com/k3s-io/k3s
Merge pull request #58345 from rootfs/azure-missing-disk
Automatic merge from submit-queue (batch tested with PRs 58319, 58345). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. azure disk: if the disk is not found, immediately detach it. This prevents azure keeps the bad request and stops issuing new request **What this PR does / why we need it**: Detach and clear bad disk URI **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #58344 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/6/head
commit
23881a9055
|
@ -43,6 +43,7 @@ const (
|
||||||
errLeaseFailed = "AcquireDiskLeaseFailed"
|
errLeaseFailed = "AcquireDiskLeaseFailed"
|
||||||
errLeaseIDMissing = "LeaseIdMissing"
|
errLeaseIDMissing = "LeaseIdMissing"
|
||||||
errContainerNotFound = "ContainerNotFound"
|
errContainerNotFound = "ContainerNotFound"
|
||||||
|
errDiskBlobNotFound = "DiskBlobNotFound"
|
||||||
)
|
)
|
||||||
|
|
||||||
var defaultBackOff = kwait.Backoff{
|
var defaultBackOff = kwait.Backoff{
|
||||||
|
@ -124,9 +125,9 @@ func (c *controllerCommon) AttachDisk(isManagedDisk bool, diskName, diskURI stri
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Errorf("azureDisk - azure attach failed, err: %v", err)
|
glog.Errorf("azureDisk - azure attach failed, err: %v", err)
|
||||||
detail := err.Error()
|
detail := err.Error()
|
||||||
if strings.Contains(detail, errLeaseFailed) {
|
if strings.Contains(detail, errLeaseFailed) || strings.Contains(detail, errDiskBlobNotFound) {
|
||||||
// if lease cannot be acquired, immediately detach the disk and return the original error
|
// if lease cannot be acquired or disk not found, immediately detach the disk and return the original error
|
||||||
glog.Infof("azureDisk - failed to acquire disk lease, try detach")
|
glog.Infof("azureDisk - err %s, try detach", detail)
|
||||||
c.cloud.DetachDiskByName(diskName, diskURI, nodeName)
|
c.cloud.DetachDiskByName(diskName, diskURI, nodeName)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue