[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v3 2/2] qemu: implement setting target disks migration port



Mostly it is just passing new parameter here and there. In case
of zero value we fallback to auto selecting port and thus keep
backward compatibility.

Also we need to fix places of auto selected port managment.
We should bother only when auto selected was done that is
when externally specified port is not 0.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy virtuozzo com>
---
 src/qemu/qemu_driver.c    |  25 +++++++----
 src/qemu/qemu_migration.c | 108 ++++++++++++++++++++++++++++++++++------------
 src/qemu/qemu_migration.h |   3 ++
 3 files changed, 101 insertions(+), 35 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 877ef20..ff01012 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12014,7 +12014,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn,
     ret = qemuMigrationPrepareDirect(driver, dconn,
                                      NULL, 0, NULL, NULL, /* No cookies */
                                      uri_in, uri_out,
-                                     &def, origname, NULL, 0, NULL, flags);
+                                     &def, origname, NULL, 0, NULL, 0, flags);
 
  cleanup:
     VIR_FREE(origname);
@@ -12067,7 +12067,7 @@ qemuDomainMigratePerform(virDomainPtr dom,
      * Consume any cookie we were able to decode though
      */
     ret = qemuMigrationPerform(driver, dom->conn, vm,
-                               NULL, dconnuri, uri, NULL, NULL, 0, NULL,
+                               NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0,
                                cookie, cookielen,
                                NULL, NULL, /* No output cookies in v2 */
                                flags, dname, resource, false);
@@ -12240,7 +12240,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn,
                                      cookiein, cookieinlen,
                                      cookieout, cookieoutlen,
                                      uri_in, uri_out,
-                                     &def, origname, NULL, 0, NULL, flags);
+                                     &def, origname, NULL, 0, NULL, 0, flags);
 
  cleanup:
     VIR_FREE(origname);
@@ -12266,6 +12266,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
     const char *dname = NULL;
     const char *uri_in = NULL;
     const char *listenAddress = cfg->migrationAddress;
+    int nbdPort = 0;
     int nmigrate_disks;
     const char **migrate_disks = NULL;
     char *origname = NULL;
@@ -12286,7 +12287,10 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
                                 &uri_in) < 0 ||
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_LISTEN_ADDRESS,
-                                &listenAddress) < 0)
+                                &listenAddress) < 0 ||
+        virTypedParamsGetInt(params, nparams,
+                             VIR_MIGRATE_PARAM_DISKS_PORT,
+                             &nbdPort) < 0)
         goto cleanup;
 
     nmigrate_disks = virTypedParamsGetStringList(params, nparams,
@@ -12317,7 +12321,8 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
                                      cookieout, cookieoutlen,
                                      uri_in, uri_out,
                                      &def, origname, listenAddress,
-                                     nmigrate_disks, migrate_disks, flags);
+                                     nmigrate_disks, migrate_disks,
+                                     nbdPort, flags);
 
  cleanup:
     VIR_FREE(migrate_disks);
@@ -12451,7 +12456,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
     }
 
     return qemuMigrationPerform(driver, dom->conn, vm, xmlin,
-                                dconnuri, uri, NULL, NULL, 0, NULL,
+                                dconnuri, uri, NULL, NULL, 0, NULL, 0,
                                 cookiein, cookieinlen,
                                 cookieout, cookieoutlen,
                                 flags, dname, resource, true);
@@ -12478,6 +12483,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
     int nmigrate_disks;
     const char **migrate_disks = NULL;
     unsigned long long bandwidth = 0;
+    int nbdPort = 0;
     int ret = -1;
 
     virCheckFlags(QEMU_MIGRATION_FLAGS, -1);
@@ -12501,7 +12507,10 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
                                 &graphicsuri) < 0 ||
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_LISTEN_ADDRESS,
-                                &listenAddress) < 0)
+                                &listenAddress) < 0 ||
+        virTypedParamsGetInt(params, nparams,
+                             VIR_MIGRATE_PARAM_DISKS_PORT,
+                             &nbdPort) < 0)
         goto cleanup;
 
     nmigrate_disks = virTypedParamsGetStringList(params, nparams,
@@ -12521,7 +12530,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
 
     ret = qemuMigrationPerform(driver, dom->conn, vm, dom_xml,
                                dconnuri, uri, graphicsuri, listenAddress,
-                               nmigrate_disks, migrate_disks,
+                               nmigrate_disks, migrate_disks, nbdPort,
                                cookiein, cookieinlen, cookieout, cookieoutlen,
                                flags, dname, bandwidth, true);
  cleanup:
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 38fa81c..0c1258b 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1709,7 +1709,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
                             virDomainObjPtr vm,
                             const char *listenAddr,
                             size_t nmigrate_disks,
-                            const char **migrate_disks)
+                            const char **migrate_disks,
+                            int nbdPort)
 {
     int ret = -1;
     qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -1717,6 +1718,34 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
     char *diskAlias = NULL;
     size_t i;
 
+    for (i = 0; i < vm->def->ndisks; i++)
+        if (qemuMigrateDisk(vm->def->disks[i], nmigrate_disks, migrate_disks))
+            break;
+
+    /* don't event start ndb server if there is no disks to migrate */
+    if (i == vm->def->ndisks)
+        return 0;
+
+    if (nbdPort < 0 || nbdPort > USHRT_MAX) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("nbd port must be in range 0-65535"));
+        return -1;
+    }
+
+    port = nbdPort;
+    if (!port && virPortAllocatorAcquire(driver->migrationPorts, &port) < 0)
+        goto cleanup;
+
+    if (qemuDomainObjEnterMonitorAsync(driver, vm,
+                                       QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
+        goto cleanup;
+
+    if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0)
+        goto exit_monitor;
+
+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
+        goto cleanup;
+
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk = vm->def->disks[i];
 
@@ -1733,12 +1762,6 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
                                            QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
             goto cleanup;
 
-        if (!port &&
-            ((virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) ||
-             (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) {
-            goto exit_monitor;
-        }
-
         if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0)
             goto exit_monitor;
         if (qemuDomainObjExitMonitor(driver, vm) < 0)
@@ -1750,7 +1773,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
 
  cleanup:
     VIR_FREE(diskAlias);
-    if (ret < 0)
+    if (ret < 0 && nbdPort == 0)
         virPortAllocatorRelease(driver->migrationPorts, port);
     return ret;
 
@@ -3314,6 +3337,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
                         const char *listenAddress,
                         size_t nmigrate_disks,
                         const char **migrate_disks,
+                        int nbdPort,
                         unsigned long flags)
 {
     virDomainObjPtr vm = NULL;
@@ -3516,7 +3540,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
         flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) &&
         virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) {
         if (qemuMigrationStartNBDServer(driver, vm, incoming->address,
-                                        nmigrate_disks, migrate_disks) < 0) {
+                                        nmigrate_disks, migrate_disks,
+                                        nbdPort) < 0) {
             goto stopjob;
         }
         cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
@@ -3568,6 +3593,11 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
 
     if (autoPort)
         priv->migrationPort = port;
+    /* in this case port is autoselected and we don't need to manage it anymore
+     * after cookie is baked
+     */
+    if (nbdPort != 0)
+        priv->nbdPort = 0;
     ret = 0;
 
  cleanup:
@@ -3579,7 +3609,11 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
         /* priv is set right after vm is added to the list of domains
          * and there is no 'goto cleanup;' in the middle of those */
         VIR_FREE(priv->origname);
-        virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
+        /* release if port is auto selected which is not the case if
+         * it is given in parameters
+         */
+        if (nbdPort == 0)
+            virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
         priv->nbdPort = 0;
         qemuDomainRemoveInactive(driver, vm);
     }
@@ -3637,7 +3671,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver,
 
     ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen,
                                   cookieout, cookieoutlen, def, origname,
-                                  st, NULL, 0, false, NULL, 0, NULL, flags);
+                                  st, NULL, 0, false, NULL, 0, NULL, 0, flags);
     return ret;
 }
 
@@ -3679,6 +3713,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver,
                            const char *listenAddress,
                            size_t nmigrate_disks,
                            const char **migrate_disks,
+                           int nbdPort,
                            unsigned long flags)
 {
     unsigned short port = 0;
@@ -3692,11 +3727,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver,
     VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, "
               "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, "
               "def=%p, origname=%s, listenAddress=%s, "
-              "nmigrate_disks=%zu, migrate_disks=%p, flags=%lx",
+              "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx",
               driver, dconn, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, NULLSTR(uri_in), uri_out,
               *def, origname, NULLSTR(listenAddress),
-              nmigrate_disks, migrate_disks, flags);
+              nmigrate_disks, migrate_disks, nbdPort, flags);
 
     *uri_out = NULL;
 
@@ -3801,7 +3836,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver,
                                   cookieout, cookieoutlen, def, origname,
                                   NULL, uri ? uri->scheme : "tcp",
                                   port, autoPort, listenAddress,
-                                  nmigrate_disks, migrate_disks, flags);
+                                  nmigrate_disks, migrate_disks, nbdPort, flags);
  cleanup:
     virURIFree(uri);
     VIR_FREE(hostname);
@@ -4889,6 +4924,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver,
                     const char *listenAddress,
                     size_t nmigrate_disks,
                     const char **migrate_disks,
+                    int nbdPort,
                     unsigned long long bandwidth,
                     bool useParams,
                     unsigned long flags)
@@ -4912,11 +4948,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver,
 
     VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, "
               "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, "
-              "nmigrate_disks=%zu, migrate_disks=%p, bandwidth=%llu, "
-              "useParams=%d, flags=%lx",
+              "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, "
+              "bandwidth=%llu, useParams=%d, flags=%lx",
               driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin),
               NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri),
-              NULLSTR(listenAddress), nmigrate_disks, migrate_disks,
+              NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort,
               bandwidth, useParams, flags);
 
     /* Unlike the virDomainMigrateVersion3 counterpart, we don't need
@@ -4966,6 +5002,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver,
                                         VIR_MIGRATE_PARAM_MIGRATE_DISKS,
                                         migrate_disks[i]) < 0)
                 goto cleanup;
+        if (nbdPort &&
+            virTypedParamsAddInt(&params, &nparams, &maxparams,
+                                 VIR_MIGRATE_PARAM_DISKS_PORT,
+                                 nbdPort) < 0)
+                goto cleanup;
     }
 
     if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED)
@@ -5232,6 +5273,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver,
                               const char *listenAddress,
                               size_t nmigrate_disks,
                               const char **migrate_disks,
+                              int nbdPort,
                               unsigned long flags,
                               const char *dname,
                               unsigned long resource,
@@ -5247,10 +5289,12 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver,
 
     VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, "
               "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, "
-              "migrate_disks=%p, flags=%lx, dname=%s, resource=%lu",
+              "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, "
+              "resource=%lu",
               driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
               NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress),
-              nmigrate_disks, migrate_disks, flags, NULLSTR(dname), resource);
+              nmigrate_disks, migrate_disks, nbdPort, flags, NULLSTR(dname),
+              resource);
 
     if (flags & VIR_MIGRATE_TUNNELLED && uri) {
         virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
@@ -5266,6 +5310,13 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
+    if (flags & VIR_MIGRATE_TUNNELLED && nbdPort) {
+        virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
+                       _("disk port address is not supported by tunnelled "
+                         "migration"));
+        goto cleanup;
+    }
+
     /* the order of operations is important here; we make sure the
      * destination side is completely setup before we touch the source
      */
@@ -5345,8 +5396,8 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver,
     if (*v3proto) {
         ret = doPeer2PeerMigrate3(driver, sconn, dconn, dconnuri, vm, xmlin,
                                   dname, uri, graphicsuri, listenAddress,
-                                  nmigrate_disks, migrate_disks, resource,
-                                  useParams, flags);
+                                  nmigrate_disks, migrate_disks, nbdPort,
+                                  resource, useParams, flags);
     } else {
         ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm,
                                   dconnuri, flags, dname, resource);
@@ -5383,6 +5434,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
                         const char *listenAddress,
                         size_t nmigrate_disks,
                         const char **migrate_disks,
+                        int nbdPort,
                         const char *cookiein,
                         int cookieinlen,
                         char **cookieout,
@@ -5418,7 +5470,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         ret = doPeer2PeerMigrate(driver, conn, vm, xmlin,
                                  dconnuri, uri, graphicsuri, listenAddress,
-                                 nmigrate_disks, migrate_disks,
+                                 nmigrate_disks, migrate_disks, nbdPort,
                                  flags, dname, resource, &v3proto);
     } else {
         qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2);
@@ -5552,6 +5604,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
                      const char *listenAddress,
                      size_t nmigrate_disks,
                      const char **migrate_disks,
+                     int nbdPort,
                      const char *cookiein,
                      int cookieinlen,
                      char **cookieout,
@@ -5563,13 +5616,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
 {
     VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, "
               "uri=%s, graphicsuri=%s, listenAddress=%s, "
-              "nmigrate_disks=%zu, migrate_disks=%p, "
+              "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, "
               "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, "
               "flags=%lx, dname=%s, resource=%lu, v3proto=%d",
               driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
               NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress),
-              nmigrate_disks, migrate_disks, NULLSTR(cookiein), cookieinlen,
-              cookieout, cookieoutlen, flags, NULLSTR(dname), resource, v3proto);
+              nmigrate_disks, migrate_disks, nbdPort,
+              NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen,
+              flags, NULLSTR(dname), resource, v3proto);
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (cookieinlen) {
@@ -5580,7 +5634,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
 
         return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, uri,
                                        graphicsuri, listenAddress,
-                                       nmigrate_disks, migrate_disks,
+                                       nmigrate_disks, migrate_disks, nbdPort,
                                        cookiein, cookieinlen,
                                        cookieout, cookieoutlen,
                                        flags, dname, resource, v3proto);
@@ -5601,7 +5655,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
         } else {
             return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL,
                                            uri, graphicsuri, listenAddress,
-                                           nmigrate_disks, migrate_disks,
+                                           nmigrate_disks, migrate_disks, nbdPort,
                                            cookiein, cookieinlen,
                                            cookieout, cookieoutlen, flags,
                                            dname, resource, v3proto);
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 2c67a02..d279da4 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -53,6 +53,7 @@
     VIR_MIGRATE_PARAM_LISTEN_ADDRESS,   VIR_TYPED_PARAM_STRING,   \
     VIR_MIGRATE_PARAM_MIGRATE_DISKS,    VIR_TYPED_PARAM_STRING |  \
                                         VIR_TYPED_PARAM_MULTIPLE, \
+    VIR_MIGRATE_PARAM_DISKS_PORT,       VIR_TYPED_PARAM_INT,      \
     NULL
 
 
@@ -134,6 +135,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver,
                                const char *listenAddress,
                                size_t nmigrate_disks,
                                const char **migrate_disks,
+                               int nbdPort,
                                unsigned long flags);
 
 int qemuMigrationPerform(virQEMUDriverPtr driver,
@@ -146,6 +148,7 @@ int qemuMigrationPerform(virQEMUDriverPtr driver,
                          const char *listenAddress,
                          size_t nmigrate_disks,
                          const char **migrate_disks,
+                         int nbdPort,
                          const char *cookiein,
                          int cookieinlen,
                          char **cookieout,
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]