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

Commit 8e89176

Browse files
committed
Improving some logs
1 parent a39cb36 commit 8e89176

File tree

1 file changed

+22
-8
lines changed
  • container-object-storage-interface-controller/pkg/bucketclaim

1 file changed

+22
-8
lines changed

Diff for: container-object-storage-interface-controller/pkg/bucketclaim/bucketclaim.go

+22-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (b *bucketClaimListener) Add(ctx context.Context, bucketClaim *v1alpha1.Buc
3939
if err != nil {
4040
switch err {
4141
case util.ErrInvalidBucketClass:
42-
klog.ErrorS(util.ErrInvalidBucketClass,
42+
klog.V(3).ErrorS(util.ErrInvalidBucketClass,
4343
"bucketClaim", bucketClaim.ObjectMeta.Name,
4444
"ns", bucketClaim.ObjectMeta.Namespace,
4545
"bucketClassName", bucketClaim.Spec.BucketClassName)
@@ -50,7 +50,7 @@ func (b *bucketClaimListener) Add(ctx context.Context, bucketClaim *v1alpha1.Buc
5050
)
5151
return nil
5252
default:
53-
klog.ErrorS(err,
53+
klog.V(3).ErrorS(err,
5454
"name", bucketClaim.ObjectMeta.Name,
5555
"ns", bucketClaim.ObjectMeta.Namespace,
5656
"err", err)
@@ -77,10 +77,19 @@ func (b *bucketClaimListener) Update(ctx context.Context, old, new *v1alpha1.Buc
7777
bucketName := bucketClaim.Status.BucketName
7878
err := b.buckets().Delete(ctx, bucketName, metav1.DeleteOptions{})
7979
if err != nil {
80+
klog.V(3).ErrorS(err, "Error deleting bucket",
81+
"bucket", bucketName,
82+
"bucketClaim", bucketClaim.ObjectMeta.Name)
8083
return err
8184
}
85+
86+
klog.V(5).Infof("Successfully deleted bucket: %s from bucketClaim: %s", bucketName, bucketClaim.ObjectMeta.Name)
8287
}
8388
}
89+
90+
klog.V(3).InfoS("Update BucketClaim success",
91+
"name", bucketClaim.ObjectMeta.Name,
92+
"ns", bucketClaim.ObjectMeta.Namespace)
8493
return nil
8594
}
8695

@@ -112,7 +121,7 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
112121
bucketName = bucketClaim.Spec.ExistingBucketName
113122
bucket, err := b.buckets().Get(ctx, bucketName, metav1.GetOptions{})
114123
if err != nil {
115-
klog.ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
124+
klog.V(3).ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
116125
return err
117126
}
118127

@@ -124,6 +133,9 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
124133

125134
_, err = b.buckets().Update(ctx, bucket, metav1.UpdateOptions{})
126135
if err != nil {
136+
klog.V(3).ErrorS(err, "Error updating existing bucket",
137+
"bucket", bucket.ObjectMeta.Name,
138+
"bucketClaim", bucketClaim.ObjectMeta.Name)
127139
return err
128140
}
129141

@@ -137,7 +149,7 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
137149

138150
bucketClass, err := b.bucketClasses().Get(ctx, bucketClassName, metav1.GetOptions{})
139151
if err != nil {
140-
klog.ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
152+
klog.V(3).ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
141153
return util.ErrInvalidBucketClass
142154
}
143155

@@ -164,7 +176,9 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
164176
bucket.Spec.Protocols = protocolCopy
165177
bucket, err = b.buckets().Create(ctx, bucket, metav1.CreateOptions{})
166178
if err != nil && !errors.IsAlreadyExists(err) {
167-
klog.ErrorS(err, "name", bucketName)
179+
klog.V(3).ErrorS(err, "Error creationg bucket",
180+
"bucket", bucketName,
181+
"bucketClaim", bucketClaim.ObjectMeta.Name)
168182
return err
169183
}
170184

@@ -176,7 +190,7 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
176190
// operation doesn't happen on an outdated version of the bucketClaim.
177191
bucketClaim, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
178192
if err != nil {
179-
klog.ErrorS(err, "Failed to update status of BucketClaim", "name", bucketClaim.ObjectMeta.Name)
193+
klog.V(3).ErrorS(err, "Failed to update status of BucketClaim", "name", bucketClaim.ObjectMeta.Name)
180194
return err
181195
}
182196

@@ -185,11 +199,11 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
185199
controllerutil.AddFinalizer(bucketClaim, util.BucketClaimFinalizer)
186200
_, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).Update(ctx, bucketClaim, metav1.UpdateOptions{})
187201
if err != nil {
188-
klog.ErrorS(err, "Failed to update BucketClaim", "name", bucketClaim.ObjectMeta.Name)
202+
klog.V(3).ErrorS(err, "Failed to add finalizer BucketClaim", "name", bucketClaim.ObjectMeta.Name)
189203
return err
190204
}
191205

192-
klog.Infof("Finished creating Bucket %v", bucketName)
206+
klog.V(3).Infof("Finished creating Bucket %v", bucketName)
193207
return nil
194208
}
195209

0 commit comments

Comments
 (0)