Skip to content

Commit

Permalink
cleanup: print error message for cleanup errors (#422)
Browse files Browse the repository at this point in the history
* Print error message for cleanup errors

* another one

* fix
zchenyu authored Dec 13, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 02d16b8 commit 94fbe41
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pkg/node-cleanup/controller/controller.go
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ func (c *CleanupController) processNextWorkItem(ctx context.Context) bool {
// An error occurred so re-add the item to the queue to work on later (has backoff to avoid
// hot-looping).
c.pvQueue.AddRateLimited(key)
klog.Errorf("error syncing %q: %w, requeuing", pvName, err)
klog.Errorf("error syncing %q: %v, requeuing", pvName, err)
return true
}

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

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

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

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

4 changes: 2 additions & 2 deletions pkg/node-cleanup/deleter/deleter.go
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ func (d *Deleter) DeletePVs(ctx context.Context) {

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

0 comments on commit 94fbe41

Please sign in to comment.