From 9cc9a20fc22e4c9334148b9fa4b661d8af12d0cc Mon Sep 17 00:00:00 2001 From: Niladri Halder Date: Tue, 6 Apr 2021 19:07:06 +0530 Subject: [PATCH 1/2] Removed error return when no BDC is discovered for a PV Signed-off-by: Niladri Halder --- cmd/provisioner-localpv/app/backward_compatability.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/provisioner-localpv/app/backward_compatability.go b/cmd/provisioner-localpv/app/backward_compatability.go index 0cfeefcd..7f267606 100644 --- a/cmd/provisioner-localpv/app/backward_compatability.go +++ b/cmd/provisioner-localpv/app/backward_compatability.go @@ -48,7 +48,12 @@ func addLocalPVFinalizerOnAssociatedBDCs(kubeClient *clientset.Clientset) error bdcObj, err := blockdeviceclaim.NewKubeClient().WithNamespace(getOpenEBSNamespace()). Get(bdcName, metav1.GetOptions{}) if err != nil { - return errors.Wrapf(err, "failed to get bdc %v", bdcName) + // BDCs may not exist if the PV reclaimPolicy is set + // to 'Retain' and the BDCs have been manually removed + // Ref: github.com/openebs/openebs/issues/3363 + // TODO: Clean this part of the code up a bit. + errors.Wrapf(err, "Warning: failed to get bdc %v", bdcName) + continue } // Add finalizer only if deletionTimestamp is not set From 18d3585b4a562c5ab0a4414657398c4ce1cfb065 Mon Sep 17 00:00:00 2001 From: Niladri Halder Date: Tue, 6 Apr 2021 20:30:51 +0530 Subject: [PATCH 2/2] Change errors.Wrapf() to klog.Warningf() Signed-off-by: Niladri Halder --- cmd/provisioner-localpv/app/backward_compatability.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/provisioner-localpv/app/backward_compatability.go b/cmd/provisioner-localpv/app/backward_compatability.go index 7f267606..edf65399 100644 --- a/cmd/provisioner-localpv/app/backward_compatability.go +++ b/cmd/provisioner-localpv/app/backward_compatability.go @@ -24,6 +24,7 @@ import ( mconfig "github.com/openebs/maya/pkg/apis/openebs.io/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog" ) // This function performs the preupgrade related tasks for 1.0 to 1.1 @@ -52,7 +53,7 @@ func addLocalPVFinalizerOnAssociatedBDCs(kubeClient *clientset.Clientset) error // to 'Retain' and the BDCs have been manually removed // Ref: github.com/openebs/openebs/issues/3363 // TODO: Clean this part of the code up a bit. - errors.Wrapf(err, "Warning: failed to get bdc %v", bdcName) + klog.Warningf("failed to get bdc %v", bdcName) continue }