Skip to content

Commit d632ad2

Browse files
authored
Handle DeleteBucket errors in controllerserver.go (#300)
1 parent 3fa765b commit d632ad2

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

pkg/driver/controllerserver.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,9 @@ func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolum
249249
if err != nil {
250250
klog.Errorf("Failed to set quota limit on bucket %s: %v", bucketName, err)
251251
if params["userProvidedBucket"] == "false" {
252-
_ = sess.DeleteBucket(bucketName)
252+
if delErr := sess.DeleteBucket(bucketName); delErr != nil {
253+
klog.Errorf("Failed to delete bucket %s after quota limit failure: %v", bucketName, delErr)
254+
}
253255
}
254256
return nil, status.Error(codes.Internal, fmt.Sprintf("failed to set bucket quota limit: %v", err))
255257
}
@@ -295,7 +297,9 @@ func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolum
295297
err = sess.UpdateQuotaLimit(quotaBytes, resConfApikey, tempBucketName, endPoint, creds.IAMEndpoint)
296298
if err != nil {
297299
klog.Errorf("Failed to set quota limit on temp bucket %s: %v", tempBucketName, err)
298-
_ = sess.DeleteBucket(tempBucketName)
300+
if delErr := sess.DeleteBucket(tempBucketName); delErr != nil {
301+
klog.Errorf("Failed to delete temp bucket %s after quota limit failure: %v", tempBucketName, delErr)
302+
}
299303
return nil, status.Error(codes.Internal, fmt.Sprintf("failed to set bucket quota limit: %v", err))
300304
}
301305
klog.Infof("Successfully applied hard quota %d bytes to temp bucket %s", quotaBytes, tempBucketName)

0 commit comments

Comments
 (0)