mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-03 03:35:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move podVolumeContext into backupRequest

Browse Source 
Signed-off-by: Scott Seago <sseago@redhat.com>
This commit is contained in:
Scott Seago
2025-10-03 12:33:37 -04:00
parent 91357b28c4
commit dbaa25405d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/backup/backup.go
View File

@@ -117,7 +117,6 @@ type kubernetesBackupper struct {
podCommandExecutor podexec.PodCommandExecutor podCommandExecutor podexec.PodCommandExecutor
podVolumeBackupperFactory podvolume.BackupperFactory podVolumeBackupperFactory podvolume.BackupperFactory
podVolumeTimeout time.Duration podVolumeTimeout time.Duration
podVolumeContext context.Context
defaultVolumesToFsBackup bool defaultVolumesToFsBackup bool
clientPageSize int clientPageSize int
uploaderType string uploaderType string
@@ -365,12 +364,12 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
} }
var podVolumeCancelFunc context.CancelFunc var podVolumeCancelFunc context.CancelFunc
kb.podVolumeContext, podVolumeCancelFunc = context.WithTimeout(context.Background(), podVolumeTimeout) podVolumeContext, podVolumeCancelFunc := context.WithTimeout(context.Background(), podVolumeTimeout)
defer podVolumeCancelFunc() defer podVolumeCancelFunc()
var podVolumeBackupper podvolume.Backupper var podVolumeBackupper podvolume.Backupper
if kb.podVolumeBackupperFactory != nil { if kb.podVolumeBackupperFactory != nil {
podVolumeBackupper, err = kb.podVolumeBackupperFactory.NewBackupper(kb.podVolumeContext, log, backupRequest.Backup, kb.uploaderType) podVolumeBackupper, err = kb.podVolumeBackupperFactory.NewBackupper(podVolumeContext, log, backupRequest.Backup, kb.uploaderType)
if err != nil { if err != nil {
log.WithError(errors.WithStack(err)).Debugf("Error from NewBackupper") log.WithError(errors.WithStack(err)).Debugf("Error from NewBackupper")
return errors.WithStack(err) return errors.WithStack(err)
@@ -416,6 +415,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
kbClient: kb.kbClient, kbClient: kb.kbClient,
discoveryHelper: kb.discoveryHelper, discoveryHelper: kb.discoveryHelper,
podVolumeBackupper: podVolumeBackupper, podVolumeBackupper: podVolumeBackupper,
podVolumeContext: podVolumeContext,
podVolumeSnapshotTracker: podvolume.NewTracker(), podVolumeSnapshotTracker: podvolume.NewTracker(),
volumeSnapshotterCache: NewVolumeSnapshotterCache(volumeSnapshotterGetter), volumeSnapshotterCache: NewVolumeSnapshotterCache(volumeSnapshotterGetter),
itemHookHandler: &hook.DefaultItemHookHandler{ itemHookHandler: &hook.DefaultItemHookHandler{
@@ -848,7 +848,7 @@ func (kb *kubernetesBackupper) handleItemBlockPostHooks(itemBlock *BackupItemBlo
log := itemBlock.Log log := itemBlock.Log
// the post hooks will not execute until all PVBs of the item block pods are processed // the post hooks will not execute until all PVBs of the item block pods are processed
if err := kb.waitUntilPVBsProcessed(kb.podVolumeContext, log, itemBlock, hookPods); err != nil { if err := kb.waitUntilPVBsProcessed(itemBlock.itemBackupper.podVolumeContext, log, itemBlock, hookPods); err != nil {
log.WithError(err).Error("failed to wait PVBs processed for the ItemBlock") log.WithError(err).Error("failed to wait PVBs processed for the ItemBlock")
return return
} }

1
pkg/backup/item_backupper.go
View File

@@ -69,6 +69,7 @@ type itemBackupper struct {
kbClient kbClient.Client kbClient kbClient.Client
discoveryHelper discovery.Helper discoveryHelper discovery.Helper
podVolumeBackupper podvolume.Backupper podVolumeBackupper podvolume.Backupper
podVolumeContext context.Context
podVolumeSnapshotTracker *podvolume.Tracker podVolumeSnapshotTracker *podvolume.Tracker
kubernetesBackupper *kubernetesBackupper kubernetesBackupper *kubernetesBackupper
volumeSnapshotterCache *VolumeSnapshotterCache volumeSnapshotterCache *VolumeSnapshotterCache