1:35 a.m.
While migration is in progress and virsh is waiting for its
completion, user may want to terminate the progress by pressing
Ctrl-C. But virsh just exits on user's Ctrl-C leaving migration
in background that user isn't even aware of. It's not reasonable.
This patch lets migration be terminated if user presses Ctrl-C
while migration is in progress. virsh's behaviour is not affected
when executing other commands.
---
Hi Daniel,
This patch does what you described(but lack of progress info).
The timeout thing can be added later if this patch is acceptable.
tools/virsh.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 11 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 55e2a68..cc9f26a 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -31,6 +31,7 @@
#include <sys/stat.h>
#include <inttypes.h>
#include <signal.h>
+#include <poll.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
@@ -54,6 +55,7 @@
#include "files.h"
#include "../daemon/event.h"
#include "configmake.h"
+#include "threads.h"
static char *progname;
@@ -492,6 +494,15 @@ out:
last_error = NULL;
}
+static bool intCatched = FALSE;
+
+static void vshCatchInt(int sig ATTRIBUTE_UNUSED,
+ siginfo_t *siginfo ATTRIBUTE_UNUSED,
+ void *context ATTRIBUTE_UNUSED)
+{
+ intCatched = TRUE;
+}
+
/*
* Detection of disconnections and automatic reconnection support
*/
@@ -3381,24 +3392,38 @@ static const vshCmdOptDef opts_migrate[] = {
{NULL, 0, 0, NULL}
};
-static int
-cmdMigrate (vshControl *ctl, const vshCmd *cmd)
+static void
+doMigrate (void *opaque)
{
+ char ret = '1';
virDomainPtr dom = NULL;
const char *desturi;
const char *migrateuri;
const char *dname;
- int flags = 0, found, ret = FALSE;
+ int flags = 0, found;
+ sigset_t sigmask, oldsigmask;
+ struct {
+ vshControl *ctl;
+ vshCmd *cmd;
+ int writefd;
+ } *data = opaque;
+ vshControl *ctl = data->ctl;
+ vshCmd *cmd = data->cmd;
+
+ 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 (!(dom = vshCommandOptDomain (ctl, cmd, NULL)))
- return FALSE;
+ goto out;
desturi = vshCommandOptString (cmd, "desturi", &found);
if (!found)
- goto done;
+ goto out;
migrateuri = vshCommandOptString (cmd, "migrateuri", NULL);
@@ -3432,29 +3457,101 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd)
if (migrateuri != NULL) {
vshError(ctl, "%s", _("migrate: Unexpected migrateuri for
peer2peer/direct migration"));
- goto done;
+ goto out;
}
if (virDomainMigrateToURI (dom, desturi, flags, dname, 0) == 0)
- ret = TRUE;
+ ret = '0';
} else {
/* For traditional live migration, connect to the destination host directly. */
virConnectPtr dconn = NULL;
virDomainPtr ddom = NULL;
dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0);
- if (!dconn) goto done;
+ if (!dconn) goto out;
ddom = virDomainMigrate (dom, dconn, flags, dname, migrateuri, 0);
if (ddom) {
virDomainFree(ddom);
- ret = TRUE;
+ ret = '0';
}
virConnectClose (dconn);
}
- done:
+out:
+ pthread_sigmask(SIG_BLOCK, &oldsigmask, NULL);
+out_sig:
if (dom) virDomainFree (dom);
+ ignore_value(safewrite(data->writefd, &ret, sizeof(ret)));
+}
+
+static int
+cmdMigrate (vshControl *ctl, const vshCmd *cmd)
+{
+ int p[2];
+ virThread workerThread;
+ struct pollfd pollfd;
+ int ret;
+ char retchar;
+ struct sigaction sig_action;
+ struct sigaction old_sig_action;
+
+ struct {
+ vshControl *ctl;
+ vshCmd *cmd;
+ int writefd;
+ } data;
+
+ if (pipe(p) < 0)
+ return -1;
+
+ data.ctl = ctl;
+ data.cmd = cmd;
+ data.writefd = p[1];
+
+ if (virThreadCreate(&workerThread,
+ true,
+ doMigrate,
+ &data) < 0)
+ return -1;
+
+ intCatched = FALSE;
+ sig_action.sa_sigaction = vshCatchInt;
+ sig_action.sa_flags = SA_SIGINFO;
+ sigemptyset(&sig_action.sa_mask);
+ sigaction(SIGINT, &sig_action, &old_sig_action);
+
+ pollfd.fd = p[0];
+ pollfd.events = POLLIN;
+ pollfd.revents = 0;
+
+ ret = poll(&pollfd, 1, -1);
+ if (ret > 0) {
+ if (saferead(p[0], &retchar, sizeof(retchar)) > 0) {
+ if (retchar == '0')
+ ret = 0;
+ else
+ ret = -1;
+ } else
+ ret = -1;
+ } else if (ret < 0) {
+ if (errno == EINTR && intCatched) {
+ virDomainPtr dom;
+
+ if ((dom = vshCommandOptDomain (ctl, cmd, NULL))) {
+ virDomainAbortJob(dom);
+ virDomainFree(dom);
+ }
+ intCatched = FALSE;
+ }
+ } else {
+ /* timed out */
+ ret = -1;
+ }
+
+ sigaction(SIGINT, &old_sig_action, NULL);
+
+ virThreadJoin(&workerThread);
return ret;
}
--
1.7.3.1
--
Thanks,
Hu Tao