Skip to content
This repository was archived by the owner on Dec 3, 2024. It is now read-only.

Fix: Bucketclaim object updation facing stale object and improved logging #68

Merged
merged 3 commits into from
Sep 21, 2022
Merged

Fix: Bucketclaim object updation facing stale object and improved logging #68

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff5c0ea
Fixing a bucketclaim object updation bug
mukhoakash Sep 19, 2022
f5d937d
Fixing a couple of update bugs
mukhoakash Sep 19, 2022
6fd93c5
Improving some logs
mukhoakash Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions pkg/bucketclaim/bucketclaim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (b *bucketClaimListener) Add(ctx context.Context, bucketClaim *v1alpha1.Buc
if err != nil {
switch err {
case util.ErrInvalidBucketClass:
klog.ErrorS(util.ErrInvalidBucketClass,
klog.V(3).ErrorS(util.ErrInvalidBucketClass,
"bucketClaim", bucketClaim.ObjectMeta.Name,
"ns", bucketClaim.ObjectMeta.Namespace,
"bucketClassName", bucketClaim.Spec.BucketClassName)
Expand All @@ -50,7 +50,7 @@ func (b *bucketClaimListener) Add(ctx context.Context, bucketClaim *v1alpha1.Buc
)
return nil
default:
klog.ErrorS(err,
klog.V(3).ErrorS(err,
"name", bucketClaim.ObjectMeta.Name,
"ns", bucketClaim.ObjectMeta.Namespace,
"err", err)
Expand All @@ -77,16 +77,25 @@ func (b *bucketClaimListener) Update(ctx context.Context, old, new *v1alpha1.Buc
bucketName := bucketClaim.Status.BucketName
err := b.buckets().Delete(ctx, bucketName, metav1.DeleteOptions{})
if err != nil {
klog.V(3).ErrorS(err, "Error deleting bucket",
"bucket", bucketName,
"bucketClaim", bucketClaim.ObjectMeta.Name)
return err
}

klog.V(5).Infof("Successfully deleted bucket: %s from bucketClaim: %s", bucketName, bucketClaim.ObjectMeta.Name)
}
}

klog.V(3).InfoS("Update BucketClaim success",
"name", bucketClaim.ObjectMeta.Name,
"ns", bucketClaim.ObjectMeta.Namespace)
return nil
}

// Delete processes a bucket for which bucket request is deleted
func (b *bucketClaimListener) Delete(ctx context.Context, bucketClaim *v1alpha1.BucketClaim) error {
klog.V(3).Infof("Delete BucketClaim %v",
klog.V(3).Infof("Delete BucketClaim",
"name", bucketClaim.ObjectMeta.Name,
"ns", bucketClaim.ObjectMeta.Namespace)

Expand All @@ -99,7 +108,8 @@ func (b *bucketClaimListener) Delete(ctx context.Context, bucketClaim *v1alpha1.
// ErrInvalidBucketClass - BucketClass does not exist [requeue'd with exponential backoff]
// ErrBucketAlreadyExists - BucketClaim already processed
// non-nil err - Internal error [requeue'd with exponential backoff]
func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context, bucketClaim *v1alpha1.BucketClaim) error {
func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context, inputBucketClaim *v1alpha1.BucketClaim) error {
bucketClaim := inputBucketClaim.DeepCopy()
if bucketClaim.Status.BucketReady {
return util.ErrBucketAlreadyExists
}
Expand All @@ -111,7 +121,7 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
bucketName = bucketClaim.Spec.ExistingBucketName
bucket, err := b.buckets().Get(ctx, bucketName, metav1.GetOptions{})
if err != nil {
klog.ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
klog.V(3).ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
return err
}

Expand All @@ -123,6 +133,9 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,

_, err = b.buckets().Update(ctx, bucket, metav1.UpdateOptions{})
if err != nil {
klog.V(3).ErrorS(err, "Error updating existing bucket",
"bucket", bucket.ObjectMeta.Name,
"bucketClaim", bucketClaim.ObjectMeta.Name)
return err
}

Expand All @@ -136,7 +149,7 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,

bucketClass, err := b.bucketClasses().Get(ctx, bucketClassName, metav1.GetOptions{})
if err != nil {
klog.ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
klog.V(3).ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
return util.ErrInvalidBucketClass
}

Expand All @@ -163,16 +176,21 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
bucket.Spec.Protocols = protocolCopy
bucket, err = b.buckets().Create(ctx, bucket, metav1.CreateOptions{})
if err != nil && !errors.IsAlreadyExists(err) {
klog.ErrorS(err, "name", bucketName)
klog.V(3).ErrorS(err, "Error creationg bucket",
"bucket", bucketName,
"bucketClaim", bucketClaim.ObjectMeta.Name)
return err
}

bucketClaim.Status.BucketName = bucketName
bucketClaim.Status.BucketReady = false
}

_, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
// Fetching the updated bucketClaim again, so that the update
// operation doesn't happen on an outdated version of the bucketClaim.
bucketClaim, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
if err != nil {
klog.V(3).ErrorS(err, "Failed to update status of BucketClaim", "name", bucketClaim.ObjectMeta.Name)
return err
}

Expand All @@ -181,9 +199,11 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
controllerutil.AddFinalizer(bucketClaim, util.BucketClaimFinalizer)
_, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).Update(ctx, bucketClaim, metav1.UpdateOptions{})
if err != nil {
klog.V(3).ErrorS(err, "Failed to add finalizer BucketClaim", "name", bucketClaim.ObjectMeta.Name)
return err
}
klog.Infof("Finished creating Bucket %v", bucketName)

klog.V(3).Infof("Finished creating Bucket %v", bucketName)
return nil
}

Expand Down