External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Add --postcopy-after-precopy option to migrate

Browse Source 
Signed-off-by: Cristian Klein <cristiklein@gmail.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Cristian Klein 2014-12-01 17:00:02 +01:00 committed by Jiri Denemark
parent 257060349e
commit 4cdc4a76d3
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/virsh-domain.c
View File

@ -9643,6 +9643,10 @@ static const vshCmdOptDef opts_migrate[] = {
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("enable post-copy migration; switch to it using migrate-postcopy command") .help = N_("enable post-copy migration; switch to it using migrate-postcopy command")
}, },
{.name = "postcopy-after-precopy",
.type = VSH_OT_BOOL,
.help = N_("automatically switch to post-copy migration after one pass of pre-copy")
},
{.name = "migrateuri", {.name = "migrateuri",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.help = N_("migration URI, usually can be omitted") .help = N_("migration URI, usually can be omitted")
@ -9891,6 +9895,23 @@ virshMigrateTimeout(vshControl *ctl,
} }
} }
static void
virshMigrateIteration(virConnectPtr conn ATTRIBUTE_UNUSED,
virDomainPtr dom,
int iteration,
void *opaque)
{
vshControl *ctl = opaque;
if (iteration == 2) {
vshDebug(ctl, VSH_ERR_DEBUG,
"iteration %d finished; switching to post-copy\n",
iteration - 1);
if (virDomainMigrateStartPostCopy(dom, 0) < 0)
vshDebug(ctl, VSH_ERR_INFO, "switching to post-copy failed\n");
}
}
static bool static bool
cmdMigrate(vshControl *ctl, const vshCmd *cmd) cmdMigrate(vshControl *ctl, const vshCmd *cmd)
{ {
@ -9903,6 +9924,8 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd)
virshMigrateTimeoutAction timeoutAction = VIRSH_MIGRATE_TIMEOUT_DEFAULT; virshMigrateTimeoutAction timeoutAction = VIRSH_MIGRATE_TIMEOUT_DEFAULT;
bool live_flag = false; bool live_flag = false;
virshCtrlData data = { .dconn = NULL }; virshCtrlData data = { .dconn = NULL };
virshControlPtr priv = ctl->privData;
int iterEvent = -1;
VSH_EXCLUSIVE_OPTIONS("live", "offline"); VSH_EXCLUSIVE_OPTIONS("live", "offline");
VSH_EXCLUSIVE_OPTIONS("timeout-suspend", "timeout-postcopy"); VSH_EXCLUSIVE_OPTIONS("timeout-suspend", "timeout-postcopy");
@ -9936,6 +9959,16 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (vshCommandOptBool(cmd, "postcopy-after-precopy")) {
iterEvent = virConnectDomainEventRegisterAny(
priv->conn, dom,
VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION,
VIR_DOMAIN_EVENT_CALLBACK(virshMigrateIteration),
ctl, NULL);
if (iterEvent < 0)
goto cleanup;
}
if (pipe(p) < 0) if (pipe(p) < 0)
goto cleanup; goto cleanup;
@ -9974,6 +10007,8 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
if (data.dconn) if (data.dconn)
virConnectClose(data.dconn); virConnectClose(data.dconn);
if (iterEvent != -1)
virConnectDomainEventDeregisterAny(priv->conn, iterEvent);
virDomainFree(dom); virDomainFree(dom);
VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[0]);
VIR_FORCE_CLOSE(p[1]); VIR_FORCE_CLOSE(p[1]);

9
tools/virsh.pod
View File

@ -1530,8 +1530,9 @@ to the I<uri> namespace is displayed instead of being modified.
[I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>]
[I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>]
[I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] [I<--postcopy>] [I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] [I<--postcopy>]
I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<--postcopy-after-precopy>] I<domain> I<desturi> [I<migrateuri>]
[I<dname>] [I<--timeout> B<seconds> [I<--timeout-suspend> | I<--timeout-postcopy>]] [I<graphicsuri>] [I<listen-address>] [I<dname>]
[I<--timeout> B<seconds> [I<--timeout-suspend> | I<--timeout-postcopy>]]
[I<--xml> B<file>] [I<--migrate-disks> B<disk-list>] [I<--disks-port> B<port>] [I<--xml> B<file>] [I<--migrate-disks> B<disk-list>] [I<--disks-port> B<port>]
Migrate domain to another host. Add I<--live> for live migration; <--p2p> Migrate domain to another host. Add I<--live> for live migration; <--p2p>
@ -1562,7 +1563,9 @@ migration. I<--auto-converge> forces convergence during live migration.
I<--postcopy> enables post-copy logic in migration, but does not I<--postcopy> enables post-copy logic in migration, but does not
actually start post-copy, i.e., migration is started in pre-copy mode. actually start post-copy, i.e., migration is started in pre-copy mode.
Once migration is running, the user may switch to post-copy using the Once migration is running, the user may switch to post-copy using the
B<migrate-postcopy> command sent from another virsh instance. B<migrate-postcopy> command sent from another virsh instance or use
I<--postcopy-after-precopy> to let libvirt automatically switch to
post-copy after the first pass of pre-copy is finished.
B<Note>: Individual hypervisors usually do not support all possible types of B<Note>: Individual hypervisors usually do not support all possible types of
migration. For example, QEMU does not support direct migration. migration. For example, QEMU does not support direct migration.