From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: wei.liu2@citrix.com, Ian.Jackson@eu.citrix.com,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v2] xl: add option to leave domain paused after migration
Date: Tue, 19 Jul 2016 10:58:15 +0200 [thread overview]
Message-ID: <1468918695-2633-1-git-send-email-roger.pau@citrix.com> (raw)
This is useful for debugging domains that crash on resume from migration.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian.Jackson@eu.citrix.com
Cc: wei.liu2@citrix.com
---
Changes since v1:
- Document the newly added option in the xl man page.
---
docs/man/xl.pod.1 | 4 ++++
tools/libxl/xl_cmdimpl.c | 29 +++++++++++++++++++----------
tools/libxl/xl_cmdtable.c | 3 ++-
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index f4dc32c..f3a2bcb 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -443,6 +443,10 @@ Send <config> instead of config file from creation.
Print huge (!) amount of debug during the migration process.
+=item B<-p>
+
+Leave the domain on the receive side paused after migration.
+
=back
=item B<remus> [I<OPTIONS>] I<domain-id> I<host>
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index d8530f0..fd80442 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -4742,7 +4742,7 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug,
exit(EXIT_FAILURE);
}
-static void migrate_receive(int debug, int daemonize, int monitor,
+static void migrate_receive(int debug, int daemonize, int monitor, int pause,
int send_fd, int recv_fd,
libxl_checkpointed_stream checkpointed,
char *colo_proxy_script)
@@ -4850,8 +4850,10 @@ static void migrate_receive(int debug, int daemonize, int monitor,
if (rc) goto perhaps_destroy_notify_rc;
}
- rc = libxl_domain_unpause(ctx, domid);
- if (rc) goto perhaps_destroy_notify_rc;
+ if (!pause) {
+ rc = libxl_domain_unpause(ctx, domid);
+ if (rc) goto perhaps_destroy_notify_rc;
+ }
fprintf(stderr, "migration target: Domain started successsfully.\n");
rc = 0;
@@ -4965,7 +4967,7 @@ int main_restore(int argc, char **argv)
int main_migrate_receive(int argc, char **argv)
{
- int debug = 0, daemonize = 1, monitor = 1;
+ int debug = 0, daemonize = 1, monitor = 1, pause = 0;
libxl_checkpointed_stream checkpointed = LIBXL_CHECKPOINTED_STREAM_NONE;
int opt;
char *script = NULL;
@@ -4976,7 +4978,7 @@ int main_migrate_receive(int argc, char **argv)
COMMON_LONG_OPTS
};
- SWITCH_FOREACH_OPT(opt, "Fedr", opts, "migrate-receive", 0) {
+ SWITCH_FOREACH_OPT(opt, "Fedrp", opts, "migrate-receive", 0) {
case 'F':
daemonize = 0;
break;
@@ -4996,13 +4998,16 @@ int main_migrate_receive(int argc, char **argv)
case 0x200:
script = optarg;
break;
+ case 'p':
+ pause = 1;
+ break;
}
if (argc-optind != 0) {
help("migrate-receive");
return EXIT_FAILURE;
}
- migrate_receive(debug, daemonize, monitor,
+ migrate_receive(debug, daemonize, monitor, pause,
STDOUT_FILENO, STDIN_FILENO,
checkpointed, script);
@@ -5048,14 +5053,14 @@ int main_migrate(int argc, char **argv)
const char *ssh_command = "ssh";
char *rune = NULL;
char *host;
- int opt, daemonize = 1, monitor = 1, debug = 0;
+ int opt, daemonize = 1, monitor = 1, debug = 0, pause = 0;
static struct option opts[] = {
{"debug", 0, 0, 0x100},
{"live", 0, 0, 0x200},
COMMON_LONG_OPTS
};
- SWITCH_FOREACH_OPT(opt, "FC:s:e", opts, "migrate", 2) {
+ SWITCH_FOREACH_OPT(opt, "FC:s:ep", opts, "migrate", 2) {
case 'C':
config_filename = optarg;
break;
@@ -5069,6 +5074,9 @@ int main_migrate(int argc, char **argv)
daemonize = 0;
monitor = 0;
break;
+ case 'p':
+ pause = 1;
+ break;
case 0x100: /* --debug */
debug = 1;
break;
@@ -5096,12 +5104,13 @@ int main_migrate(int argc, char **argv)
} else {
verbose_len = (minmsglevel_default - minmsglevel) + 2;
}
- xasprintf(&rune, "exec %s %s xl%s%.*s migrate-receive%s%s",
+ xasprintf(&rune, "exec %s %s xl%s%.*s migrate-receive%s%s%s",
ssh_command, host,
pass_tty_arg ? " -t" : "",
verbose_len, verbose_buf,
daemonize ? "" : " -e",
- debug ? " -d" : "");
+ debug ? " -d" : "",
+ pause ? " -p" : "");
}
migrate_domain(domid, rune, debug, config_filename);
diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c
index bf69ffb..85c1e0f 100644
--- a/tools/libxl/xl_cmdtable.c
+++ b/tools/libxl/xl_cmdtable.c
@@ -164,7 +164,8 @@ struct cmd_spec cmd_table[] = {
" migrate-receive [-d -e]\n"
"-e Do not wait in the background (on <host>) for the death\n"
" of the domain.\n"
- "--debug Print huge (!) amount of debug during the migration process."
+ "--debug Print huge (!) amount of debug during the migration process.\n"
+ "-p Do not unpause domain after migrating it."
},
{ "restore",
&main_restore, 0, 1,
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next reply other threads:[~2016-07-19 8:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-19 8:58 Roger Pau Monne [this message]
2016-07-19 9:00 ` [PATCH v2] xl: add option to leave domain paused after migration Wei Liu
2016-07-19 13:15 ` Wei Liu
2016-07-19 15:50 ` Roger Pau Monne
2016-07-19 15:51 ` Wei Liu
2016-07-19 20:43 ` Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468918695-2633-1-git-send-email-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).