Skip to content

VDDK: Fix snapshot parent backing file lookups#4009

Merged
kubevirt-bot merged 2 commits into
kubevirt:mainfrom
mrnold:mtv-3514
Jan 13, 2026
Merged

VDDK: Fix snapshot parent backing file lookups#4009
kubevirt-bot merged 2 commits into
kubevirt:mainfrom
mrnold:mtv-3514

Conversation

@mrnold
Copy link
Copy Markdown
Contributor

@mrnold mrnold commented Jan 12, 2026 •
edited
Loading

What this PR does / why we need it:
This pull request fixes a bug in snapshot parent lookups introduced here: 5dff75

The .Parent field was dropped from the VirtualDiskFlatVer2BackingInfo and VirtualDiskRawDiskMappingVer1BackingInfo cases, but should not have been.

Which issue(s) this PR fixes:
Fixes MTV-3514
(I am not sure if this needs a separate CNV issue)

Release note:

VDDK: Correctly check snapshot parent backing info for VirtualDiskFlatVer2BackingInfo and VirtualDiskRawDiskMappingVer1BackingInfo types.

mrnold added 2 commits January 12, 2026 17:23
@mrnold
VDDK: Fix snapshot parent backing file lookups
b45e4aa 
A previously-added nil check incorrectly caused
FindDiskInRootSnapshotParent to not look at parent backing file names,
for FlatVer2 and RawDiskMappingVer1 backing info types. This change puts
the Parent field back where it belongs.

Signed-off-by: Matthew Arnold <[email protected]>
@mrnold
Copy tests for different parent backing info types.
df78d90 
Signed-off-by: Matthew Arnold <[email protected]>
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/M labels Jan 12, 2026
@coveralls
Copy link
Copy Markdown

coveralls commented Jan 12, 2026

Coverage Status

coverage: 49.482% (+0.09%) from 49.388%
when pulling df78d90 on mrnold:mtv-3514
into c5480cc on kubevirt:main.

@mrnold
Copy link
Copy Markdown
Contributor Author

mrnold commented Jan 12, 2026

/test pull-cdi-unit-test

Looks like a failure in prlimit_test? I don't see any failures on my new tests, so I am running this again.

@akalenyu
Copy link
Copy Markdown
Collaborator

akalenyu commented Jan 13, 2026

/test pull-cdi-unit-test

Looks like a failure in prlimit_test? I don't see any failures on my new tests, so I am running this again.

Yeah not related to this change, #3341

akalenyu
akalenyu reviewed Jan 13, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@akalenyu akalenyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 13, 2026
@kubevirt-bot
Copy link
Copy Markdown
Contributor

kubevirt-bot commented Jan 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akalenyu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 13, 2026
@kubevirt-bot kubevirt-bot merged commit c6647fa into kubevirt:main Jan 13, 2026
21 checks passed
@mhenriks
Copy link
Copy Markdown
Member

mhenriks commented Jan 13, 2026

/cherrypick release-v1.63

@mhenriks
Copy link
Copy Markdown
Member

mhenriks commented Jan 13, 2026

/cherrypick release-v1.62

@mhenriks
Copy link
Copy Markdown
Member

mhenriks commented Jan 13, 2026

/cherrypick release-v1.61

@kubevirt-bot
Copy link
Copy Markdown
Contributor

kubevirt-bot commented Jan 13, 2026

@mhenriks: #4009 failed to apply on top of branch "release-v1.61":

Applying: VDDK: Fix snapshot parent backing file lookups
Using index info to reconstruct a base tree...
M	pkg/importer/vddk-datasource_amd64.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/importer/vddk-datasource_amd64.go
CONFLICT (content): Merge conflict in pkg/importer/vddk-datasource_amd64.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 VDDK: Fix snapshot parent backing file lookups
Details

In response to this:

/cherrypick release-v1.61

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kubevirt-bot
Copy link
Copy Markdown
Contributor

kubevirt-bot commented Jan 13, 2026

@mhenriks: #4009 failed to apply on top of branch "release-v1.62":

Applying: VDDK: Fix snapshot parent backing file lookups
Using index info to reconstruct a base tree...
M	pkg/importer/vddk-datasource_amd64.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/importer/vddk-datasource_amd64.go
CONFLICT (content): Merge conflict in pkg/importer/vddk-datasource_amd64.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 VDDK: Fix snapshot parent backing file lookups
Details

In response to this:

/cherrypick release-v1.62

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kubevirt-bot
Copy link
Copy Markdown
Contributor

kubevirt-bot commented Jan 13, 2026

@mhenriks: new pull request created: #4011

Details

In response to this:

/cherrypick release-v1.63

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kubevirt-bot kubevirt-bot mentioned this pull request Jan 13, 2026
Merged
@mrnold
Copy link
Copy Markdown
Contributor Author

mrnold commented Feb 24, 2026

/cherry-pick release-v1.64

@kubevirt-bot kubevirt-bot mentioned this pull request Feb 24, 2026
Merged
@kubevirt-bot
Copy link
Copy Markdown
Contributor

kubevirt-bot commented Feb 24, 2026

@mrnold: new pull request created: #4045

Details

In response to this:

/cherry-pick release-v1.64

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akalenyu akalenyu akalenyu left review comments

@alromeros alromeros Awaiting requested review from alromeros

Assignees

@akalenyu akalenyu

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mrnold @coveralls @akalenyu @kubevirt-bot @mhenriks