Skip to content

Commit 50a09d5

Browse files
authored
Concatenate msg in setInstanceError when delete PV fails (#3581)
1 parent 25faef1 commit 50a09d5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/syncer/cnsoperator/controller/cnsregistervolume/cnsregistervolume_controller.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -669,15 +669,16 @@ func (r *ReconcileCnsRegisterVolume) Reconcile(ctx context.Context,
669669
pvcSpec, metav1.CreateOptions{})
670670
if err != nil {
671671
log.Errorf("Failed to create PVC with spec: %+v. Error: %+v", pvcSpec, err)
672-
setInstanceError(ctx, r, instance,
673-
fmt.Sprintf("Failed to create PVC: %s for volume with err: %+v", instance.Spec.PvcName, err))
672+
errMsg := fmt.Sprintf("Failed to create PVC: %s for volume with err: %+v", instance.Spec.PvcName, err)
673+
setInstanceError(ctx, r, instance, errMsg)
674674
// Delete PV created above.
675675
err = k8sclient.CoreV1().PersistentVolumes().Delete(ctx, pvName, *metav1.NewDeleteOptions(0))
676676
if err != nil {
677677
log.Errorf("Delete PV %s failed with error: %+v", pvName, err)
678+
combinedErrMsg := fmt.Sprintf("%s. Additionally, cleanup failed: Delete PV %s failed with error: %+v",
679+
errMsg, pvName, err)
680+
setInstanceError(ctx, r, instance, combinedErrMsg)
678681
}
679-
setInstanceError(ctx, r, instance,
680-
fmt.Sprintf("Delete PV %s failed with error: %+v", pvName, err))
681682
return reconcile.Result{RequeueAfter: timeout}, nil
682683
} else {
683684
log.Infof("PVC: %s is created successfully", instance.Spec.PvcName)

0 commit comments

Comments
 (0)