mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 22:13:18 +00:00
virsh: Use vshWatchJob in cmdSave
This patch alters saving code, so we can report progress and allow cancel via ^C.
This commit is contained in:
parent
5ccc7f6488
commit
6e4c540d28
@ -2409,25 +2409,35 @@ static const vshCmdOptDef opts_save[] = {
|
|||||||
N_("filename containing updated XML for the target")},
|
N_("filename containing updated XML for the target")},
|
||||||
{"running", VSH_OT_BOOL, 0, N_("set domain to be running on restore")},
|
{"running", VSH_OT_BOOL, 0, N_("set domain to be running on restore")},
|
||||||
{"paused", VSH_OT_BOOL, 0, N_("set domain to be paused on restore")},
|
{"paused", VSH_OT_BOOL, 0, N_("set domain to be paused on restore")},
|
||||||
|
{"verbose", VSH_OT_BOOL, 0, N_("display the progress of save")},
|
||||||
{NULL, 0, 0, NULL}
|
{NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool
|
static void
|
||||||
cmdSave(vshControl *ctl, const vshCmd *cmd)
|
doSave(void *opaque)
|
||||||
{
|
{
|
||||||
virDomainPtr dom;
|
vshCtrlData *data = opaque;
|
||||||
|
vshControl *ctl = data->ctl;
|
||||||
|
const vshCmd *cmd = data->cmd;
|
||||||
|
char ret = '1';
|
||||||
|
virDomainPtr dom = NULL;
|
||||||
const char *name = NULL;
|
const char *name = NULL;
|
||||||
const char *to = NULL;
|
const char *to = NULL;
|
||||||
bool ret = false;
|
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
const char *xmlfile = NULL;
|
const char *xmlfile = NULL;
|
||||||
char *xml = NULL;
|
char *xml = NULL;
|
||||||
|
sigset_t sigmask, oldsigmask;
|
||||||
|
|
||||||
|
sigemptyset(&sigmask);
|
||||||
|
sigaddset(&sigmask, SIGINT);
|
||||||
|
if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0)
|
||||||
|
goto out_sig;
|
||||||
|
|
||||||
if (!vshConnectionUsability(ctl, ctl->conn))
|
if (!vshConnectionUsability(ctl, ctl->conn))
|
||||||
return false;
|
goto out;
|
||||||
|
|
||||||
if (vshCommandOptString(cmd, "file", &to) <= 0)
|
if (vshCommandOptString(cmd, "file", &to) <= 0)
|
||||||
return false;
|
goto out;
|
||||||
|
|
||||||
if (vshCommandOptBool(cmd, "bypass-cache"))
|
if (vshCommandOptBool(cmd, "bypass-cache"))
|
||||||
flags |= VIR_DOMAIN_SAVE_BYPASS_CACHE;
|
flags |= VIR_DOMAIN_SAVE_BYPASS_CACHE;
|
||||||
@ -2438,28 +2448,76 @@ cmdSave(vshControl *ctl, const vshCmd *cmd)
|
|||||||
|
|
||||||
if (vshCommandOptString(cmd, "xml", &xmlfile) < 0) {
|
if (vshCommandOptString(cmd, "xml", &xmlfile) < 0) {
|
||||||
vshError(ctl, "%s", _("malformed xml argument"));
|
vshError(ctl, "%s", _("malformed xml argument"));
|
||||||
return false;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
|
if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
|
||||||
return false;
|
goto out;
|
||||||
|
|
||||||
if (xmlfile &&
|
if (xmlfile &&
|
||||||
virFileReadAll(xmlfile, 8192, &xml) < 0)
|
virFileReadAll(xmlfile, 8192, &xml) < 0)
|
||||||
goto cleanup;
|
goto out;
|
||||||
|
|
||||||
if (((flags || xml)
|
if (((flags || xml)
|
||||||
? virDomainSaveFlags(dom, to, xml, flags)
|
? virDomainSaveFlags(dom, to, xml, flags)
|
||||||
: virDomainSave(dom, to)) < 0) {
|
: virDomainSave(dom, to)) < 0) {
|
||||||
vshError(ctl, _("Failed to save domain %s to %s"), name, to);
|
vshError(ctl, _("Failed to save domain %s to %s"), name, to);
|
||||||
goto cleanup;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
vshPrint(ctl, _("Domain %s saved to %s\n"), name, to);
|
ret = '0';
|
||||||
ret = true;
|
|
||||||
|
out:
|
||||||
|
pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
|
||||||
|
out_sig:
|
||||||
|
if (dom) virDomainFree (dom);
|
||||||
|
VIR_FREE(xml);
|
||||||
|
ignore_value(safewrite(data->writefd, &ret, sizeof(ret)));
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
cmdSave(vshControl *ctl, const vshCmd *cmd)
|
||||||
|
{
|
||||||
|
bool ret = false;
|
||||||
|
virDomainPtr dom = NULL;
|
||||||
|
int p[2] = {-1. -1};
|
||||||
|
virThread workerThread;
|
||||||
|
bool verbose = false;
|
||||||
|
vshCtrlData data;
|
||||||
|
const char *to = NULL;
|
||||||
|
const char *name = NULL;
|
||||||
|
|
||||||
|
if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (vshCommandOptString(cmd, "file", &to) <= 0)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
if (vshCommandOptBool (cmd, "verbose"))
|
||||||
|
verbose = true;
|
||||||
|
|
||||||
|
if (pipe(p) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
data.ctl = ctl;
|
||||||
|
data.cmd = cmd;
|
||||||
|
data.writefd = p[1];
|
||||||
|
|
||||||
|
if (virThreadCreate(&workerThread,
|
||||||
|
true,
|
||||||
|
doSave,
|
||||||
|
&data) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Save"));
|
||||||
|
|
||||||
|
virThreadJoin(&workerThread);
|
||||||
|
|
||||||
|
if (ret)
|
||||||
|
vshPrint(ctl, _("\nDomain %s saved to %s\n"), name, to);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(xml);
|
if (dom)
|
||||||
virDomainFree(dom);
|
virDomainFree(dom);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -898,7 +898,7 @@ have also reverted all storage volumes back to the same contents as when
|
|||||||
the state file was created.
|
the state file was created.
|
||||||
|
|
||||||
=item B<save> I<domain-id> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>]
|
=item B<save> I<domain-id> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>]
|
||||||
[{I<--running> | I<--paused>}]
|
[{I<--running> | I<--paused>}] [I<--verbose>]
|
||||||
|
|
||||||
Saves a running domain (RAM, but not disk state) to a state file so that
|
Saves a running domain (RAM, but not disk state) to a state file so that
|
||||||
it can be restored
|
it can be restored
|
||||||
@ -909,9 +909,9 @@ If I<--bypass-cache> is specified, the save will avoid the file system
|
|||||||
cache, although this may slow down the operation.
|
cache, although this may slow down the operation.
|
||||||
|
|
||||||
The progress may be monitored using B<domjobinfo> virsh command and canceled
|
The progress may be monitored using B<domjobinfo> virsh command and canceled
|
||||||
with B<domjobabort> command (sent by another virsh instance). Interrupting
|
with B<domjobabort> command (sent by another virsh instance). Another option
|
||||||
(usually with C<Ctrl-C>) the virsh process which runs B<save> command is not
|
is to send SIGINT (usually with C<Ctrl-C>) to the virsh process running
|
||||||
enough to actually cancel the operation.
|
B<save> command. I<--verbose> displays the progress of save.
|
||||||
|
|
||||||
This is roughly equivalent to doing a hibernate on a running computer,
|
This is roughly equivalent to doing a hibernate on a running computer,
|
||||||
with all the same limitations. Open network connections may be
|
with all the same limitations. Open network connections may be
|
||||||
|
Loading…
Reference in New Issue
Block a user