Skip to content

MTV-1699 Avoid potentially exceeding memory limit in multi-stage VDDK imports. #3559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubevirt-bot merged 9 commits into from
Apr 1, 2025
+246 −197
Merged

MTV-1699 Avoid potentially exceeding memory limit in multi-stage VDDK imports. #3559

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a04d75
Move VDDK code around to reduce memory usage.
mrnold Dec 6, 2024
ded33e4
Update VDDK multi-stage unit tests.
mrnold Dec 6, 2024
a54eb89
Fix failing unit tests, rename mockable Stat.
mrnold Dec 6, 2024
b8b336b
Remove some unit test debug logging.
mrnold Dec 6, 2024
62d8617
Avoid logging out of VMware until transfer is done.
mrnold Dec 6, 2024
d67a921
Avoid early break in VDDK delta copy.
mrnold Feb 8, 2025
5dff751
Avoid potential crash finding snapshot information.
mrnold Feb 11, 2025
7d8a1c7
Correct changed block area copy loop.
mrnold Feb 15, 2025
55b52aa
Un-break filesystem imports.
mrnold Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Avoid potential crash finding snapshot information. 
This is mostly cosmetic as the importer pod isn't going to be able to
transfer anything anyway, but an error message is nicer than a panic.

Signed-off-by: Matthew Arnold <marnold@redhat.com>
  • Loading branch information
@mrnold
mrnold committed Mar 14, 2025
commit 5dff7516380f14207c96e188485a9f75ad9c27a4
12 changes: 9 additions & 3 deletions pkg/importer/vddk-datasource_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,17 @@ func (vmware *VMwareClient) FindDiskInRootSnapshotParent(snapshots []types.Virtu
var parent *types.VirtualDeviceFileBackingInfo
switch disk.Backing.(type) {
case *types.VirtualDiskFlatVer1BackingInfo:
parent = &disk.Backing.(*types.VirtualDiskFlatVer1BackingInfo).Parent.VirtualDeviceFileBackingInfo
if info := disk.Backing.(*types.VirtualDiskFlatVer1BackingInfo); info != nil && info.Parent != nil {
parent = &info.Parent.VirtualDeviceFileBackingInfo
}
case *types.VirtualDiskFlatVer2BackingInfo:
parent = &disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo).Parent.VirtualDeviceFileBackingInfo
if info := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo); info != nil && info.Parent != nil {
parent = &info.VirtualDeviceFileBackingInfo
}
case *types.VirtualDiskRawDiskMappingVer1BackingInfo:
parent = &disk.Backing.(*types.VirtualDiskRawDiskMappingVer1BackingInfo).Parent.VirtualDeviceFileBackingInfo
if info := disk.Backing.(*types.VirtualDiskRawDiskMappingVer1BackingInfo); info != nil && info.Parent != nil {
parent = &info.VirtualDeviceFileBackingInfo
}
}
if parent != nil && parent.FileName == fileName {
return disk
Expand Down