From a3081cccb82e73e3f36bbc5020618c8197bbd358 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Wed, 8 Mar 2023 04:36:31 +0800 Subject: [PATCH] fix(host): tls live migrate disable mulitfd (#16155) Signed-off-by: wanyaoqi --- pkg/hostman/guestman/guesttasks.go | 5 +++++ pkg/hostman/guestman/qemu-kvm.go | 2 +- pkg/hostman/guestman/qemu-kvmhelper.go | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/hostman/guestman/guesttasks.go b/pkg/hostman/guestman/guesttasks.go index 58278e589b..253059b2c8 100644 --- a/pkg/hostman/guestman/guesttasks.go +++ b/pkg/hostman/guestman/guesttasks.go @@ -1026,6 +1026,11 @@ func (s *SGuestLiveMigrateTask) onSetAutoConverge(res string) { } s.startMigrate() } + if s.params.EnableTLS { + s.Monitor.MigrateSetCapability("multifd", "off", cb) + return + } + log.Infof("migrate src guest enable multifd") s.Monitor.MigrateSetCapability("multifd", "on", cb) } diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 052579fc1d..18ea7c11c9 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -989,7 +989,7 @@ func (s *SKVMGuestInstance) setDestMigrateTLS(ctx context.Context, data *jsonuti } func (s *SKVMGuestInstance) migrateEnableMultifd() error { - if version.LT(s.QemuVersion, "4.0.0") { + if version.LT(s.QemuVersion, "4.0.0") || s.LiveMigrateUseTls { return nil } var err = make(chan error) diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index dc690d951e..0b520462b8 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -509,6 +509,8 @@ function nic_mtu() { if jsonutils.QueryBoolean(data, "live_migrate_use_tls", false) { s.LiveMigrateUseTls = true input.LiveMigrateUseTLS = true + } else { + s.LiveMigrateUseTls = false } } else if s.Desc.IsSlave { input.LiveMigratePort = uint(*s.LiveMigrateDestPort)