Merge pull request #5940 from rook/mergify/bp/release-1.4/pr-5935

ceph: use deleteOBCResourceLogError instead of deleteOBCResource (bp #5935)
rook · Aug 3, 2020 · 2ef3b2e · 2ef3b2e
2 parents b78c701 + f16bfc4
commit 2ef3b2e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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
 	}
 
@@ -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)
 	}
 }