Skip to content

fix(vm): avoid restartAwaitingChanges flicker for hotplug block devices #2496

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

Open
eofff wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −23
Open

fix(vm): avoid restartAwaitingChanges flicker for hotplug block devices #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364b1d2
fix restart changes
Jun 16, 2026
9620e61
fix test
Jun 16, 2026
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
4 changes: 4 additions & 0 deletions images/virtualization-artifact/pkg/controller/vmchange/comparator_block_devices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const blockDevicesPath = "blockDeviceRefs"

// compareBlockDevices returns changes between current and desired blockDevices lists.
func compareBlockDevices(current, desired *v1alpha2.VirtualMachineSpec) []FieldChange {
if current.EnableParavirtualization && desired.EnableParavirtualization {
return nil
}

if len(current.BlockDeviceRefs) == 0 && len(desired.BlockDeviceRefs) == 0 {
return nil
}
Expand Down
38 changes: 15 additions & 23 deletions images/virtualization-artifact/pkg/controller/vmchange/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ blockDeviceRefs:
),
},
{
"apply immediate on blockDeviceRefs add disk",
"no changes on blockDeviceRefs add disk with paravirt enabled",
`
enableParavirtualization: true
blockDeviceRefs:
Expand All @@ -297,13 +297,10 @@ blockDeviceRefs:
name: linux
`,
nil,
assertChanges(
actionRequired(ActionApplyImmediate),
requirePathOperation("blockDeviceRefs.0", ChangeAdd),
),
assertNoChanges(),
},
{
"apply immediate on blockDeviceRefs remove disk",
"no changes on blockDeviceRefs remove disk with paravirt enabled",
`
enableParavirtualization: true
blockDeviceRefs:
Expand All @@ -319,10 +316,7 @@ blockDeviceRefs:
name: linux
`,
nil,
assertChanges(
actionRequired(ActionApplyImmediate),
requirePathOperation("blockDeviceRefs.0", ChangeRemove),
),
assertNoChanges(),
},
{
"restart on blockDeviceRefs remove disk with paravirt disabled",
Expand All @@ -347,7 +341,7 @@ blockDeviceRefs:
),
},
{
"apply immediate on blockDeviceRefs change order",
"no changes on blockDeviceRefs change order with paravirt enabled",
`
enableParavirtualization: true
blockDeviceRefs:
Expand All @@ -365,14 +359,10 @@ blockDeviceRefs:
name: linux
`,
nil,
assertChanges(
actionRequired(ActionApplyImmediate),
requirePathOperation("blockDeviceRefs.0", ChangeReplace),
requirePathOperation("blockDeviceRefs.1", ChangeReplace),
),
assertNoChanges(),
},
{
"apply immediate on blockDeviceRefs change order :: bigger",
"no changes on blockDeviceRefs change order with paravirt enabled :: bigger",
`
enableParavirtualization: true
blockDeviceRefs:
Expand Down Expand Up @@ -403,12 +393,7 @@ blockDeviceRefs:
name: linux
`,
nil,
assertChanges(
actionRequired(ActionApplyImmediate),
requirePathOperation("blockDeviceRefs.0", ChangeReplace),
requirePathOperation("blockDeviceRefs.1", ChangeReplace),
requirePathOperation("blockDeviceRefs.4", ChangeReplace),
),
assertNoChanges(),
},
{
"restart on provisioning add",
Expand Down Expand Up @@ -769,6 +754,13 @@ func assertChanges(asserts ...func(t *testing.T, changes SpecChanges)) func(t *t
}
}

func assertNoChanges() func(t *testing.T, changes SpecChanges) {
return func(t *testing.T, changes SpecChanges) {
t.Helper()
require.True(t, changes.IsEmpty(), "changes should be empty, got %+v", changes)
}
}

func actionRequired(actionType ActionType) func(t *testing.T, changes SpecChanges) {
return func(t *testing.T, changes SpecChanges) {
t.Helper()
Expand Down
Loading