mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2025-12-23 06:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix9247: Protect VolumeSnapshot field

Browse Source 
Signed-off-by: 0xLeo258 <noixe0312@gmail.com>
This commit is contained in:
0xLeo258
2025-09-11 14:45:39 +08:00
parent 1ec281a64e
commit f2a27c3864
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/backup/item_backupper.go
View File

@@ -699,6 +699,8 @@ func (ib *itemBackupper) takePVSnapshot(obj runtime.Unstructured, log logrus.Fie
snapshot.Status.Phase = volume.SnapshotPhaseCompleted snapshot.Status.Phase = volume.SnapshotPhaseCompleted
snapshot.Status.ProviderSnapshotID = snapshotID snapshot.Status.ProviderSnapshotID = snapshotID
} }
ib.backupRequest.requestLock.Lock()
defer ib.backupRequest.requestLock.Unlock()
ib.backupRequest.VolumeSnapshots = append(ib.backupRequest.VolumeSnapshots, snapshot) ib.backupRequest.VolumeSnapshots = append(ib.backupRequest.VolumeSnapshots, snapshot)
// nil errors are automatically removed // nil errors are automatically removed

4
pkg/backup/request.go
View File

@@ -17,6 +17,8 @@ limitations under the License.
package backup package backup
import ( import (
"sync"
"github.com/vmware-tanzu/velero/internal/hook" "github.com/vmware-tanzu/velero/internal/hook"
"github.com/vmware-tanzu/velero/internal/resourcepolicies" "github.com/vmware-tanzu/velero/internal/resourcepolicies"
"github.com/vmware-tanzu/velero/internal/volume" "github.com/vmware-tanzu/velero/internal/volume"
@@ -36,7 +38,7 @@ type itemKey struct {
// materialized (e.g. backup/snapshot locations, includes/excludes, etc.) // materialized (e.g. backup/snapshot locations, includes/excludes, etc.)
type Request struct { type Request struct {
*velerov1api.Backup *velerov1api.Backup
requestLock sync.Mutex
StorageLocation *velerov1api.BackupStorageLocation StorageLocation *velerov1api.BackupStorageLocation
SnapshotLocations []*velerov1api.VolumeSnapshotLocation SnapshotLocations []*velerov1api.VolumeSnapshotLocation
NamespaceIncludesExcludes *collections.IncludesExcludes NamespaceIncludesExcludes *collections.IncludesExcludes