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

Merge pull request #86250 from jsafrane/fix-failed-delete-warning

Browse Source 
AWS: Don't report deletion of attached volume as warning
This commit is contained in:
Kubernetes Prow Robot 2019-12-16 21:39:21 -08:00 committed by GitHub
commit 756eef1b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/cloud-provider/volume/errors/errors.go
View File

@ -65,3 +65,13 @@ func NewDanglingError(msg string, node k8stypes.NodeName, devicePath string) err
DevicePath: devicePath, DevicePath: devicePath,
} }
} }
// IsDanglingError returns true if an error is DanglingAttachError
func IsDanglingError(err error) bool {
switch err.(type) {
case *DanglingAttachError:
return true
default:
return false
}
}

6
staging/src/k8s.io/legacy-cloud-providers/aws/aws.go
View File

@ -2578,6 +2578,10 @@ func (c *Cloud) DeleteDisk(volumeName KubernetesVolumeID) (bool, error) {
klog.V(2).Infof("Volume %s not found when deleting it, assuming it's deleted", awsDisk.awsID) klog.V(2).Infof("Volume %s not found when deleting it, assuming it's deleted", awsDisk.awsID)
return false, nil return false, nil
} }
if volerr.IsDanglingError(err) {
// The volume is still attached somewhere
return false, volerr.NewDeletedVolumeInUseError(err.Error())
}
klog.Error(err) klog.Error(err)
} }
@ -2598,7 +2602,7 @@ func (c *Cloud) checkIfAvailable(disk *awsDisk, opName string, instance string)
} }
volumeState := aws.StringValue(info.State) volumeState := aws.StringValue(info.State)
opError := fmt.Sprintf("Error %s EBS volume %q", opName, disk.awsID) opError := fmt.Sprintf("error %s EBS volume %q", opName, disk.awsID)
if len(instance) != 0 { if len(instance) != 0 {
opError = fmt.Sprintf("%q to instance %q", opError, instance) opError = fmt.Sprintf("%q to instance %q", opError, instance)
} }