Skip to content

Commit 5b3aa25

Browse files
author
Zhang Wenhao
committed
<fix>[kvm]: fix NVRAM migration handler duplicate call
Move NVRAM preparation logic from preVmMigration to preMigrateVm to avoid handling twice during VM migration. Remove migration type checks since the logic should apply to all migration scenarios. Resolves: ZSV-11438 Related: ZSV-11310 Change-Id: I6578706d6f79696578787079626f6b72616a6a7a
1 parent f2d0e83 commit 5b3aa25

1 file changed

Lines changed: 2 additions & 9 deletions

File tree

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181

8282
import static org.zstack.compute.vm.VmGlobalConfig.ENABLE_UEFI_SECURE_BOOT;
8383
import static org.zstack.core.Platform.operr;
84-
import static org.zstack.header.vm.VmMigrationType.HostMigration;
85-
import static org.zstack.header.vm.VmMigrationType.PrimaryStorageMigration;
8684
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PostMigration;
8785
import static org.zstack.header.vm.additions.VmHostFileSyncReason.BeforeHaStart;
8886
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareReRead;
@@ -168,17 +166,12 @@ private void prepareNvRamToStartVmCmd(KVMAgentCommands.StartVmCmd cmd, NvRamSpec
168166

169167
@Override
170168
public void preMigrateVm(VmInstanceInventory inv, String destHostUuid, Completion completion) {
171-
completion.success(); // use preVmMigration instead of preMigrateVm to prevent from handle twice
169+
prepareNvRamBeforeMigration(inv, destHostUuid, completion);
172170
}
173171

174172
@Override
175173
public void preVmMigration(VmInstanceInventory vm, VmMigrationType type, String dstHostUuid, Completion completion) {
176-
if (HostMigration != type && PrimaryStorageMigration != type) {
177-
completion.success();
178-
return;
179-
}
180-
181-
prepareNvRamBeforeMigration(vm, dstHostUuid, completion);
174+
completion.success(); // use preMigrateVm instead of preVmMigration to prevent from handle twice
182175
}
183176

184177
private void prepareNvRamBeforeMigration(VmInstanceInventory vm, String dstHostUuid, Completion completion) {

0 commit comments

Comments
 (0)