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

Merge pull request #79656 from humblec/heketi-error

Browse Source 
If volume in delete request does not exist, return success.
This commit is contained in:
Kubernetes Prow Robot 2019-07-12 05:15:06 -07:00 committed by GitHub
commit 4423ff5fdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/glusterfs/glusterfs.go
View File

@ -95,6 +95,9 @@ const (
glusterTypeAnn = "gluster.org/type"
glusterDescAnn = "Gluster-Internal: Dynamically provisioned PV"
heketiVolIDAnn = "gluster.kubernetes.io/heketi-volume-id"
// Error string returned by heketi
errIDNotFound = "Id not found"
)
func (plugin *glusterfsPlugin) Init(host volume.VolumeHost) error {
@ -668,8 +671,11 @@ func (d *glusterfsVolumeDeleter) Delete() error {
}
err = cli.VolumeDelete(volumeID)
if err != nil {
klog.Errorf("failed to delete volume %s: %v", volumeName, err)
return err
if dstrings.TrimSpace(err.Error()) != errIDNotFound {
klog.Errorf("failed to delete volume %s: %v", volumeName, err)
return fmt.Errorf("failed to delete volume %s: %v", volumeName, err)
}
klog.V(2).Infof("volume %s not present in heketi, ignoring", volumeName)
}
klog.V(2).Infof("volume %s deleted successfully", volumeName)