From 59f1e8364e5b1a9969404b32a156867fe95a63e2 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Fri, 31 Jul 2020 15:31:33 +0530 Subject: [PATCH 1/2] ceph: fix up deleteOBCResourceLogError Signed-off-by: Jiffin Tony Thottan --- pkg/operator/ceph/object/bucket/provisioner.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index d16aa1027..4d51fb4c0 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -504,9 +504,9 @@ func (p *Provisioner) populateDomainAndPort(sc *storagev1.StorageClass) error { return nil } -func (p *Provisioner) deleteOBCResourceLogError(name string) { - if err := p.deleteOBCResource(""); err != nil { - logger.Warningf("error deleting OBC resource. %v", err) +func (p *Provisioner) deleteOBCResourceLogError(bucketname string) { + if err := p.deleteOBCResource(bucketname); err != nil { + logger.Warningf("failed to delete OBC resource. %v", err) } } From 091679cbebd747519eecd3051c14ff7114ac91df Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Fri, 31 Jul 2020 15:36:26 +0530 Subject: [PATCH 2/2] ceph: use deleteOBCResourceLogError instead of deleteOBCResource Signed-off-by: Jiffin Tony Thottan --- pkg/operator/ceph/object/bucket/provisioner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index 4d51fb4c0..05b260203 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -104,7 +104,7 @@ func (p Provisioner) Provision(options *apibkt.BucketOptions) (*bktv1alpha1.Obje // setting quota limit if it is enabled err = p.setAdditionalSettings(options) if err != nil { - p.deleteOBCResource(p.bucketName) + p.deleteOBCResourceLogError(p.bucketName) return nil, err } @@ -192,7 +192,7 @@ func (p Provisioner) Grant(options *apibkt.BucketOptions) (*bktv1alpha1.ObjectBu // setting quota limit if it is enabled err = p.setAdditionalSettings(options) if err != nil { - p.deleteOBCResource("") + p.deleteOBCResourceLogError("") return nil, err }