mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-17 20:56:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use thread safe map for cancel recorder (#10255)

Browse Source 
* use thread safe map for cancel recorder

Signed-off-by: Lyndon-Li <lyonghui@vmware.com>

* use atomic load and store

Signed-off-by: Lyndon-Li <lyonghui@vmware.com>

---------

Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
lyndon-li
2026-08-17 16:55:01 +08:00
committed by GitHub
parent d4e62bb979
commit da5bee7097
9 changed files with 264 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/pod_volume_backup_controller.go
+8 -8
View File
@@ -20,6 +20,7 @@ import (
"context"
"fmt"
"strings"
"sync"
"time"
"github.com/cockroachdb/errors"
@@ -89,7 +90,6 @@ func NewPodVolumeBackupReconciler(
preparingTimeout: preparingTimeout,
resourceTimeout: resourceTimeout,
exposer: exposer.NewPodVolumeExposer(kubeClient, logger),
cancelledPVB: make(map[string]time.Time),
dataMovePriorityClass: dataMovePriorityClass,
privileged: privileged,
podLabels: podLabels,
@@ -112,7 +112,7 @@ type PodVolumeBackupReconciler struct {
vgdpCounter *exposer.VgdpCounter
preparingTimeout time.Duration
resourceTimeout time.Duration
cancelledPVB map[string]time.Time
cancelledPVB sync.Map
dataMovePriorityClass string
privileged bool
podLabels map[string]string
@@ -183,7 +183,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
}
}
} else {
delete(r.cancelledPVB, pvb.Name)
r.cancelledPVB.Delete(pvb.Name)
if controllerutil.ContainsFinalizer(pvb, PodVolumeFinalizer) {
if err := UpdatePVBWithRetry(ctx, r.client, req.NamespacedName, log, func(pvb *velerov1api.PodVolumeBackup) bool {
@@ -204,9 +204,9 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
}
if pvb.Spec.Cancel {
if spotted, found := r.cancelledPVB[pvb.Name]; !found {
r.cancelledPVB[pvb.Name] = r.clock.Now()
} else {
v, loaded := r.cancelledPVB.LoadOrStore(pvb.Name, r.clock.Now())
if loaded {
spotted := v.(time.Time)
delay := cancelDelayOthers
if pvb.Status.Phase == velerov1api.PodVolumeBackupPhaseInProgress {
delay = cancelDelayInProgress
@@ -215,7 +215,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
if time.Since(spotted) > delay {
log.Infof("PVB %s is canceled in Phase %s but not handled in reasonable time", pvb.GetName(), pvb.Status.Phase)
if r.tryCancelPodVolumeBackup(ctx, pvb, "") {
delete(r.cancelledPVB, pvb.Name)
r.cancelledPVB.Delete(pvb.Name)
}
return ctrl.Result{}, nil
@@ -620,7 +620,7 @@ func (r *PodVolumeBackupReconciler) OnDataPathCancelled(ctx context.Context, nam
}); err != nil {
log.WithError(err).Error("error updating PVB status on cancel")
} else {
delete(r.cancelledPVB, pvb.Name)
r.cancelledPVB.Delete(pvb.Name)
}
}