From c22cc06b902bc738abb9cdb67dce779c3137945c Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 2 Jul 2019 18:22:51 +0530 Subject: [PATCH] If volume in delete request does not exist, return success. Signed-off-by: Humble Chirammal --- pkg/volume/glusterfs/glusterfs.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index f1fd4e64c5c..52ff8cb1328 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -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)