Skip to content

Commit 92eab72

Browse files
committed
fix: streamline DeletionEvent to update MCPDeletedAt with retry logic
1 parent f4a1365 commit 92eab72

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

internal/usage/tracking.go

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,25 +168,15 @@ func (u *UsageTracker) DeletionEvent(ctx context.Context, project string, worksp
168168
return fmt.Errorf("error getting object key: %w", err)
169169
}
170170

171-
var mcpUsage v1.MCPUsage
172-
err = u.client.Get(ctx, objectKey, &mcpUsage)
173-
if k8serrors.IsNotFound(err) {
174-
return nil
175-
}
176-
if err != nil {
177-
return fmt.Errorf("error getting MCPUsage resource: %w", err)
178-
}
179-
180-
mcpUsage.Spec.MCPDeletedAt = metav1.NewTime(time.Now().UTC())
181-
err = u.client.Update(ctx, &mcpUsage)
182-
if err != nil {
171+
deletedAt := metav1.NewTime(time.Now().UTC())
183172
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
173+
var mcpUsage v1.MCPUsage
184174
// Re-fetch the latest version to avoid update conflicts
185175
err := u.client.Get(ctx, objectKey, &mcpUsage)
186176
if err != nil {
187177
return fmt.Errorf("error getting MCPUsage resource during retry: %w", err)
188178
}
189-
mcpUsage.Spec.MCPDeletedAt = metav1.NewTime(time.Now().UTC())
179+
mcpUsage.Spec.MCPDeletedAt = deletedAt
190180
err = u.client.Update(ctx, &mcpUsage)
191181
if err != nil {
192182
if k8serrors.IsConflict(err) {
@@ -196,6 +186,7 @@ func (u *UsageTracker) DeletionEvent(ctx context.Context, project string, worksp
196186
}
197187
return nil
198188
})
189+
199190
if err != nil {
200191
return err
201192
}

0 commit comments

Comments
 (0)