Skip to content

Commit 94fbe41

Browse files
authored
cleanup: print error message for cleanup errors (#422)
* Print error message for cleanup errors * another one * fix
1 parent 02d16b8 commit 94fbe41

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/node-cleanup/controller/controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (c *CleanupController) processNextWorkItem(ctx context.Context) bool {
175175
// An error occurred so re-add the item to the queue to work on later (has backoff to avoid
176176
// hot-looping).
177177
c.pvQueue.AddRateLimited(key)
178-
klog.Errorf("error syncing %q: %w, requeuing", pvName, err)
178+
klog.Errorf("error syncing %q: %v, requeuing", pvName, err)
179179
return true
180180
}
181181

@@ -237,7 +237,7 @@ func (c *CleanupController) syncHandler(ctx context.Context, pvName string) erro
237237
err = c.deletePVC(ctx, pvc)
238238
if err != nil {
239239
cleanupmetrics.PersistentVolumeClaimDeleteFailedTotal.Inc()
240-
klog.Errorf("failed to delete pvc %q in namespace &q: %w", pvClaimRef.Name, pvClaimRef.Namespace, err)
240+
klog.Errorf("failed to delete pvc %q in namespace %q: %v", pvClaimRef.Name, pvClaimRef.Namespace, err)
241241
return err
242242
}
243243

@@ -255,7 +255,7 @@ func (c *CleanupController) nodeDeleted(obj interface{}) {
255255
func (c *CleanupController) startCleanupTimersIfNeeded() {
256256
pvs, err := c.pvLister.List(labels.Everything())
257257
if err != nil {
258-
klog.Errorf("error listing pvs: %w", err)
258+
klog.Errorf("error listing pvs: %v", err)
259259
return
260260
}
261261

@@ -272,7 +272,7 @@ func (c *CleanupController) startCleanupTimersIfNeeded() {
272272

273273
shouldEnqueue, err := c.shouldEnqueueEntry(pv, nodeName)
274274
if err != nil {
275-
klog.Errorf("error determining whether to enqueue entry with pv %q: %w", pv.Name, err)
275+
klog.Errorf("error determining whether to enqueue entry with pv %q: %v", pv.Name, err)
276276
continue
277277
}
278278

pkg/node-cleanup/deleter/deleter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (d *Deleter) DeletePVs(ctx context.Context) {
8484

8585
referencesDeletedNode, err := d.referencesNonExistentNode(pv)
8686
if err != nil {
87-
klog.Errorf("error determining if pv %q references deleted node: %w", pv.Name, err)
87+
klog.Errorf("error determining if pv %q references deleted node: %v", pv.Name, err)
8888
continue
8989
}
9090
if !referencesDeletedNode {
@@ -102,7 +102,7 @@ func (d *Deleter) DeletePVs(ctx context.Context) {
102102
klog.Infof("Attempting to delete PV that has NodeAffinity to deleted Node, pv: %s", pv.Name)
103103
if err = d.deletePV(ctx, pv.Name); err != nil {
104104
cleanupmetrics.PersistentVolumeDeleteFailedTotal.WithLabelValues(string(phase)).Inc()
105-
klog.Errorf("Error deleting PV: %s", pv.Name)
105+
klog.Errorf("Error deleting PV %q: %v", pv.Name, err)
106106
continue
107107
}
108108
// TODO: Cache successful deletion to avoid multiple delete calls

0 commit comments

Comments
 (0)