Skip to content

fix(vm): livemigration force handling for PreferForced/AlwaysForced #2179

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
danilrwx wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(vm): livemigration force handling for PreferForced/AlwaysForced #2179

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
961ca88
fix(cli): don't set vmop.force by default
danilrwx Apr 1, 2026
17536ba
fix(livemigration): reject force=false for AlwaysForced policy
danilrwx Apr 1, 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: 2 additions & 2 deletions .../virtualization-artifact/pkg/controller/vmop/migration/internal/handler/lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ var _ = Describe("LifecycleHandler", func() {
),

// AlwaysForced cases.
Entry("should become Failed for AlwaysForced and force=nil",
Entry("is ok for AlwaysForced and force=nil",
newVMOPEvictPending(),
v1alpha2.AlwaysForcedMigrationPolicy,
v1alpha2.VMOPPhaseFailed,
v1alpha2.VMOPPhasePending,
),
Entry("should become Failed for AlwaysForced and force=false",
newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
Expand Down
10 changes: 3 additions & 7 deletions images/virtualization-artifact/pkg/livemigration/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ func CalculateEffectivePolicy(vm v1alpha2.VirtualMachine, vmop *v1alpha2.Virtual
// Override autoConverge value.
if vmop != nil {
switch effectivePolicy {
case v1alpha2.PreferSafeMigrationPolicy:
if vmop.Spec.Force != nil {
autoConvergePtr = vmop.Spec.Force
}
case v1alpha2.PreferForcedMigrationPolicy:
case v1alpha2.PreferSafeMigrationPolicy, v1alpha2.PreferForcedMigrationPolicy:
if vmop.Spec.Force != nil {
autoConvergePtr = vmop.Spec.Force
}
Expand All @@ -62,8 +58,8 @@ func CalculateEffectivePolicy(vm v1alpha2.VirtualMachine, vmop *v1alpha2.Virtual
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=true is not applicable for VM liveMigrationPolicy %s", effectivePolicy)
}
case v1alpha2.AlwaysForcedMigrationPolicy:
if vmop.Spec.Force == nil || !*vmop.Spec.Force {
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=true is required for VM liveMigrationPolicy %s", effectivePolicy)
if vmop.Spec.Force != nil && !*vmop.Spec.Force {
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=false is not applicable for VM liveMigrationPolicy %s", effectivePolicy)
}
}
}
Expand Down
13 changes: 10 additions & 3 deletions src/cli/internal/cmd/lifecycle/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

"github.com/deckhouse/virtualization/api/client/kubeclient"
"github.com/deckhouse/virtualization/src/cli/internal/clientconfig"
Expand Down Expand Up @@ -106,7 +107,8 @@ func (l *Lifecycle) Run(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
mgr := l.getManager(client)
forceSet := cmd.Flags().Changed(forceFlag)
mgr := l.getManager(client, forceSet)

ctx, cancel := context.WithTimeout(context.Background(), l.opts.Timeout)
defer cancel()
Expand Down Expand Up @@ -166,12 +168,17 @@ func (l *Lifecycle) getNameNamespace(defaultNamespace string, args []string) (st
return name, namespace, nil
}

func (l *Lifecycle) getManager(client kubeclient.Client) Manager {
func (l *Lifecycle) getManager(client kubeclient.Client, forceSet bool) Manager {
var forcePtr *bool
if forceSet {
forcePtr = ptr.To(l.opts.Force)
}

return vmop.New(
client,
vmop.WithCreateOnly(l.opts.CreateOnly),
vmop.WithWaitComplete(l.opts.WaitComplete),
vmop.WithForce(l.opts.Force),
vmop.WithForce(forcePtr),
)
}

Expand Down
11 changes: 5 additions & 6 deletions src/cli/internal/cmd/lifecycle/vmop/vmop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

"github.com/deckhouse/virtualization/api/client/kubeclient"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
Expand All @@ -38,7 +37,7 @@ type VirtualMachineOperation struct {
}

type options struct {
force bool
force *bool
waitComplete bool
createOnly bool
}
Expand All @@ -56,7 +55,7 @@ func New(client kubeclient.Client, opts ...func(*VirtualMachineOperation)) *Virt
return vmop
}

func WithForce(force bool) func(*VirtualMachineOperation) {
func WithForce(force *bool) func(*VirtualMachineOperation) {
return func(o *VirtualMachineOperation) {
o.options.force = force
}
Expand All @@ -80,7 +79,7 @@ func (v VirtualMachineOperation) Stop(ctx context.Context, vmName, vmNamespace s
}

func (v VirtualMachineOperation) Start(ctx context.Context, vmName, vmNamespace string) (msg string, err error) {
vmop := v.newVMOP(vmName, vmNamespace, v1alpha2.VMOPTypeStart, false)
vmop := v.newVMOP(vmName, vmNamespace, v1alpha2.VMOPTypeStart, nil)
return v.do(ctx, vmop, v.options.createOnly, v.options.waitComplete)
}

Expand Down Expand Up @@ -237,7 +236,7 @@ func (v VirtualMachineOperation) isPhaseOrFailed(vmop *v1alpha2.VirtualMachineOp
return vmop.Status.Phase == phase || vmop.Status.Phase == v1alpha2.VMOPPhaseFailed
}

func (v VirtualMachineOperation) newVMOP(vmName, vmNamespace string, t v1alpha2.VMOPType, force bool) *v1alpha2.VirtualMachineOperation {
func (v VirtualMachineOperation) newVMOP(vmName, vmNamespace string, t v1alpha2.VMOPType, force *bool) *v1alpha2.VirtualMachineOperation {
return &v1alpha2.VirtualMachineOperation{
TypeMeta: metav1.TypeMeta{
Kind: v1alpha2.VirtualMachineOperationKind,
Expand All @@ -250,7 +249,7 @@ func (v VirtualMachineOperation) newVMOP(vmName, vmNamespace string, t v1alpha2.
Spec: v1alpha2.VirtualMachineOperationSpec{
Type: t,
VirtualMachine: vmName,
Force: ptr.To(force),
Force: force,
},
}
}
Expand Down
Loading