101 lines
3.5 KiB
Diff
101 lines
3.5 KiB
Diff
|
From 52036c598d2670b4d103c923be1fdd95c096be4e Mon Sep 17 00:00:00 2001
|
||
|
|
Message-ID: <52036c598d2670b4d103c923be1fdd95c096be4e.1707394627.git.jdenemar@redhat.com>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 16 Jan 2024 15:52:25 +0100
|
||
|
|
Subject: [PATCH] qemu: migration: Properly handle reservation of manually
|
||
|
|
specified NBD port
|
||
|
|
|
||
|
|
Originally the migration code didn't register the NBD disk port with the
|
||
|
|
port allocator when it was manually specified. Later when commit
|
||
|
|
e74d627bb3bc2684cbe3 refactored the code and started registering it, the
|
||
|
|
old logic which was clearing 'priv->nbdPort' in case when it was manually
|
||
|
|
specified was not removed.
|
||
|
|
|
||
|
|
This caused following problems:
|
||
|
|
- the port was not released after successful migration
|
||
|
|
- the port was released even when it was not allocated on failures
|
||
|
|
regarding the NBD server start
|
||
|
|
- the port was not released on other failures of the migration after
|
||
|
|
NBD server startup
|
||
|
|
|
||
|
|
To address this we remove the assumption that 'priv->nbdPort' is used
|
||
|
|
only for auto-allocated port and fill it only once the port is
|
||
|
|
allocated and make the caller of qemuMigrationDstStartNBDServer
|
||
|
|
responsible for releasing it.
|
||
|
|
|
||
|
|
Fixes: e74d627bb3bc2684cbe3edc1e2f7cc745b4e1ff3
|
||
|
|
Resolves: https://issues.redhat.com/browse/RHEL-21543
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
||
|
|
(cherry picked from commit 43f027b57c4d885fc076ffb8829d525a3c343c6f)
|
||
|
|
---
|
||
|
|
src/qemu/qemu_migration.c | 22 +++++++---------------
|
||
|
|
1 file changed, 7 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
||
|
|
index 25dc16a9e9..6f8b830969 100644
|
||
|
|
--- a/src/qemu/qemu_migration.c
|
||
|
|
+++ b/src/qemu/qemu_migration.c
|
||
|
|
@@ -527,6 +527,8 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
|
||
|
|
* arguments in 'migrate' monitor command.
|
||
|
|
* Error is reported here.
|
||
|
|
*
|
||
|
|
+ * Caller is responsible for releasing 'priv->nbdPort' from the port allocator.
|
||
|
|
+ *
|
||
|
|
* Returns 0 on success, -1 otherwise.
|
||
|
|
*/
|
||
|
|
static int
|
||
|
|
@@ -627,6 +629,9 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
|
||
|
|
|
||
|
|
server.port = port;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ /* caller will release the port */
|
||
|
|
+ priv->nbdPort = server.port;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0)
|
||
|
|
@@ -643,14 +648,9 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
|
||
|
|
qemuDomainObjExitMonitor(vm);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (server.transport == VIR_STORAGE_NET_HOST_TRANS_TCP)
|
||
|
|
- priv->nbdPort = server.port;
|
||
|
|
-
|
||
|
|
ret = 0;
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
- if (ret < 0)
|
||
|
|
- virPortAllocatorRelease(server.port);
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
exit_monitor:
|
||
|
|
@@ -3261,11 +3261,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
|
||
|
|
virDomainAuditStart(vm, "migrated", false);
|
||
|
|
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
|
||
|
|
VIR_ASYNC_JOB_MIGRATION_IN, stopFlags);
|
||
|
|
- /* release if port is auto selected which is not the case if
|
||
|
|
- * it is given in parameters
|
||
|
|
- */
|
||
|
|
- if (nbdPort == 0)
|
||
|
|
- virPortAllocatorRelease(priv->nbdPort);
|
||
|
|
+ virPortAllocatorRelease(priv->nbdPort);
|
||
|
|
priv->nbdPort = 0;
|
||
|
|
}
|
||
|
|
goto cleanup;
|
||
|
|
@@ -3425,11 +3421,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
|
||
|
|
|
||
|
|
if (autoPort)
|
||
|
|
priv->migrationPort = port;
|
||
|
|
- /* in this case port is not auto selected and we don't need to manage it
|
||
|
|
- * anymore after cookie is baked
|
||
|
|
- */
|
||
|
|
- if (nbdPort != 0)
|
||
|
|
- priv->nbdPort = 0;
|
||
|
|
+
|
||
|
|
ret = 0;
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
--
|
||
|
|
2.43.0
|