mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-18 21:26: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_restore_controller.go
+8 -8
View File
@@ -20,6 +20,7 @@ import (
"context"
"fmt"
"strings"
"sync"
"time"
"github.com/cockroachdb/errors"
@@ -90,7 +91,6 @@ func NewPodVolumeRestoreReconciler(
preparingTimeout: preparingTimeout,
resourceTimeout: resourceTimeout,
exposer: exposer.NewPodVolumeExposer(kubeClient, logger),
cancelledPVR: make(map[string]time.Time),
dataMovePriorityClass: dataMovePriorityClass,
privileged: privileged,
repoConfigMgr: repoConfigMgr,
@@ -114,7 +114,7 @@ type PodVolumeRestoreReconciler struct {
vgdpCounter *exposer.VgdpCounter
preparingTimeout time.Duration
resourceTimeout time.Duration
cancelledPVR map[string]time.Time
cancelledPVR sync.Map
dataMovePriorityClass string
privileged bool
repoConfigMgr repository.ConfigManager
@@ -188,7 +188,7 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req
}
}
} else {
delete(r.cancelledPVR, pvr.Name)
r.cancelledPVR.Delete(pvr.Name)
if controllerutil.ContainsFinalizer(pvr, PodVolumeFinalizer) {
if err := UpdatePVRWithRetry(ctx, r.client, req.NamespacedName, log, func(pvr *velerov1api.PodVolumeRestore) bool {
@@ -209,9 +209,9 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req
}
if pvr.Spec.Cancel {
if spotted, found := r.cancelledPVR[pvr.Name]; !found {
r.cancelledPVR[pvr.Name] = r.clock.Now()
} else {
v, loaded := r.cancelledPVR.LoadOrStore(pvr.Name, r.clock.Now())
if loaded {
spotted := v.(time.Time)
delay := cancelDelayOthers
if pvr.Status.Phase == velerov1api.PodVolumeRestorePhaseInProgress {
delay = cancelDelayInProgress
@@ -220,7 +220,7 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req
if time.Since(spotted) > delay {
log.Infof("PVR %s is canceled in Phase %s but not handled in rasonable time", pvr.GetName(), pvr.Status.Phase)
if r.tryCancelPodVolumeRestore(ctx, pvr, "") {
delete(r.cancelledPVR, pvr.Name)
r.cancelledPVR.Delete(pvr.Name)
}
return ctrl.Result{}, nil
@@ -895,7 +895,7 @@ func (r *PodVolumeRestoreReconciler) OnDataPathCancelled(ctx context.Context, na
}); err != nil {
log.WithError(err).Error("error updating PVR status on cancel")
} else {
delete(r.cancelledPVR, pvr.Name)
r.cancelledPVR.Delete(pvr.Name)
}
}