Merge pull request #5935 from thotz/deleteOBCResourceLogError
ceph: use deleteOBCResourceLogError instead of deleteOBCResource
This commit is contained in:
1 file changed
+5
-5
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user