9:21 a.m.
This patch alters saving code, so we can report progress
and allow cancel via ^C.
---
tools/virsh.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++-------
tools/virsh.pod | 8 +++---
2 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index ab46b8c..6edac1e 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2735,19 +2735,29 @@ static const vshCmdOptDef opts_managedsave[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or
uuid")},
{"running", VSH_OT_BOOL, 0, N_("set domain to be running on next
start")},
{"paused", VSH_OT_BOOL, 0, N_("set domain to be paused on next
start")},
+ {"verbose", VSH_OT_BOOL, 0, N_("display the progress of save")},
{NULL, 0, 0, NULL}
};
-static bool
-cmdManagedSave(vshControl *ctl, const vshCmd *cmd)
+static void
+doManagedsave(void *opaque)
{
- virDomainPtr dom;
+ char ret = '1';
+ vshCtrlData *data = opaque;
+ vshControl *ctl = data->ctl;
+ const vshCmd *cmd = data->cmd;
+ virDomainPtr dom = NULL;
const char *name;
- bool ret = false;
unsigned int flags = 0;
+ 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))
- return false;
+ goto out;
if (vshCommandOptBool(cmd, "bypass-cache"))
flags |= VIR_DOMAIN_SAVE_BYPASS_CACHE;
@@ -2757,18 +2767,63 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd)
flags |= VIR_DOMAIN_SAVE_PAUSED;
if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
- return false;
+ goto out;
if (virDomainManagedSave(dom, flags) < 0) {
vshError(ctl, _("Failed to save domain %s state"), name);
- goto cleanup;
+ goto out;
}
- vshPrint(ctl, _("Domain %s state saved by libvirt\n"), name);
- ret = true;
+ ret = '0';
+out:
+ pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
+out_sig:
+ if (dom)
+ virDomainFree (dom);
+ ignore_value(safewrite(data->writefd, &ret, sizeof(ret)));
+}
+
+static bool
+cmdManagedSave(vshControl *ctl, const vshCmd *cmd)
+{
+ virDomainPtr dom;
+ int p[2] = { -1, -1};
+ bool ret = false;
+ bool verbose = false;
+ const char *name = NULL;
+ vshCtrlData data;
+ virThread workerThread;
+
+ if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
+ return false;
+
+ 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,
+ doManagedsave,
+ &data) < 0)
+ goto cleanup;
+
+ ret = do_watch_job(ctl, dom, verbose, p[0], 0, NULL, "Managedsave");
+
+ virThreadJoin(&workerThread);
+
+ if (ret)
+ vshPrint(ctl, _("\nDomain %s state saved by libvirt\n"), name);
cleanup:
virDomainFree(dom);
+ VIR_FORCE_CLOSE(p[0]);
+ VIR_FORCE_CLOSE(p[1]);
return ret;
}
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 0141728..bffc92f 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -733,7 +733,7 @@ The editor used can be supplied by the C<$VISUAL> or
C<$EDITOR> environment
variables, and defaults to C<vi>.
=item B<managedsave> I<domain-id> [I<--bypass-cache>]
-[{I<--running> | I<--paused>}]
+[{I<--running> | I<--paused>}] [I<--verbose>]
Save and destroy (stop) a running domain, so it can be restarted from the same
state at a later time. When the virsh B<start> command is next run for
@@ -742,9 +742,9 @@ If I<--bypass-cache> is specified, the save will avoid the file
system
cache, although this may slow down the operation.
The progress may be monitored using B<domjobinfo> virsh command and canceled
-with B<domjobabort> command (sent by another virsh instance). Interrupting
-(usually with C<Ctrl-C>) the virsh process which runs B<managedsave> command
-is not enough to actually cancel the operation.
+with B<domjobabort> command (sent by another virsh instance). Another option
+is to send SIGINT (usually with C<Ctrl-C>) to the virsh process running
+B<managedsave> command. I<--verbose> displays the progress of save.
Normally, starting a managed save will decide between running or paused
based on the state the domain was in when the save was done; passing
--
1.7.3.4