|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3] tools: set migration constraints from cmdline
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1359649053 -3600
# Node ID bd1412703913e2e77ec54da8600887368a893597
# Parent 256d59b2bc8a413876559dc8daf4c52ba46677de
tools: set migration constraints from cmdline
Add new options to xm/xl migrate to control the process of migration.
The intention is to optionally abort the migration if it takes too long
to migrate a busy guest due to the high number of dirty pages. Currently
the guest is suspended to transfer the remaining dirty pages. This
transfer can take too long, which can confuse the guest if its suspended
for too long.
-M <number> Number of iterations before final suspend (default: 30)
--max_iters <number>
-m <factor> Max amount of memory to transfer before final suspend (default:
3*RAM)
--max_factor <factor>
-N Abort migration instead of doing final suspend.
--no_suspend
The changes to libxl change the API, is that approach acceptable?
v3:
- move logic errors in libxl__domain_suspend and fixed help text in
cmd_table to separate patches
- fix syntax error in XendCheckpoint.py
- really pass max_iters and max_factor in libxl__xc_domain_save
- make libxl_domain_suspend_0x040200 declaration globally visible
- bump libxenlight.so SONAME from 2.0 to 3.0 due to changed
libxl_domain_suspend
v2:
- use LIBXL_API_VERSION and define libxl_domain_suspend_0x040200
- fix logic error in min_reached check in xc_domain_save
- add longopts
- update --help text
- correct description of migrate --help text
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
diff -r 256d59b2bc8a -r bd1412703913 tools/libxc/xc_domain_save.c
--- a/tools/libxc/xc_domain_save.c
+++ b/tools/libxc/xc_domain_save.c
@@ -43,6 +43,8 @@
*/
#define DEF_MAX_ITERS 29 /* limit us to 30 times round loop */
#define DEF_MAX_FACTOR 3 /* never send more than 3x p2m_size */
+/* Suspend guest for final transit once number of dirty pages is that low */
+#define DEF_MIN_REMAINING 50
struct save_ctx {
unsigned long hvirt_start; /* virtual starting address of the hypervisor */
@@ -804,6 +806,7 @@ int xc_domain_save(xc_interface *xch, in
int rc = 1, frc, i, j, last_iter = 0, iter = 0;
int live = (flags & XCFLAGS_LIVE);
int debug = (flags & XCFLAGS_DEBUG);
+ int no_suspend = (flags & XCFLAGS_DOMSAVE_NOSUSPEND);
int superpages = !!hvm;
int race = 0, sent_last_iter, skip_this_iter = 0;
unsigned int sent_this_iter = 0;
@@ -1525,10 +1528,20 @@ int xc_domain_save(xc_interface *xch, in
if ( live )
{
+ int min_reached = sent_this_iter + skip_this_iter <
DEF_MIN_REMAINING;
if ( (iter >= max_iters) ||
- (sent_this_iter+skip_this_iter < 50) ||
+ min_reached ||
(total_sent > dinfo->p2m_size*max_factor) )
{
+ if ( !min_reached && no_suspend )
+ {
+ ERROR("Live migration aborted, as requested. (guest too
busy?)"
+ " total_sent %lu iter %d, max_iters %u max_factor %u",
+ total_sent, iter, max_iters, max_factor);
+ rc = 1;
+ goto out;
+ }
+
DPRINTF("Start last iteration\n");
last_iter = 1;
diff -r 256d59b2bc8a -r bd1412703913 tools/libxc/xenguest.h
--- a/tools/libxc/xenguest.h
+++ b/tools/libxc/xenguest.h
@@ -28,6 +28,8 @@
#define XCFLAGS_HVM 4
#define XCFLAGS_STDVGA 8
#define XCFLAGS_CHECKPOINT_COMPRESS 16
+#define XCFLAGS_DOMSAVE_NOSUSPEND 32
+
#define X86_64_B_SIZE 64
#define X86_32_B_SIZE 32
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/Makefile
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -5,7 +5,7 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
-MAJOR = 2.0
+MAJOR = 2.1
MINOR = 0
XLUMAJOR = 1.0
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -756,7 +756,8 @@ static void domain_suspend_cb(libxl__egc
}
-int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags,
+static int __libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd,
+ int flags, int max_iters, int max_factor,
const libxl_asyncop_how *ao_how)
{
AO_CREATE(ctx, domid, ao_how);
@@ -779,6 +780,9 @@ int libxl_domain_suspend(libxl_ctx *ctx,
dss->type = type;
dss->live = flags & LIBXL_SUSPEND_LIVE;
dss->debug = flags & LIBXL_SUSPEND_DEBUG;
+ dss->max_iters = max_iters;
+ dss->max_factor = max_factor;
+ dss->xlflags = flags;
libxl__domain_suspend(egc, dss);
return AO_INPROGRESS;
@@ -787,6 +791,20 @@ int libxl_domain_suspend(libxl_ctx *ctx,
return AO_ABORT(rc);
}
+int libxl_domain_suspend_0x040200(libxl_ctx *ctx, uint32_t domid, int fd,
+ int flags, const libxl_asyncop_how *ao_how)
+{
+ return __libxl_domain_suspend(ctx, domid, fd, flags, 0,0, ao_how);
+}
+
+int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags,
+ int max_iters, int max_factor,
+ const libxl_asyncop_how *ao_how)
+{
+ return __libxl_domain_suspend(ctx, domid, fd, flags, max_iters,
+ max_factor, ao_how);
+}
+
int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid)
{
int ret;
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -500,12 +500,25 @@ int libxl_domain_create_restore(libxl_ct
void libxl_domain_config_init(libxl_domain_config *d_config);
void libxl_domain_config_dispose(libxl_domain_config *d_config);
-int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd,
+int libxl_domain_suspend_0x040200(libxl_ctx *ctx, uint32_t domid, int fd,
int flags, /* LIBXL_SUSPEND_* */
const libxl_asyncop_how *ao_how)
LIBXL_EXTERNAL_CALLERS_ONLY;
+#ifdef LIBXL_API_VERSION
+#if LIBXL_API_VERSION == 0x040200
+#define libxl_domain_suspend libxl_domain_suspend_0x040200
+#endif
+#else
+int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd,
+ int flags, /* LIBXL_SUSPEND_* */
+ int max_iters, int max_factor,
+ const libxl_asyncop_how *ao_how)
+ LIBXL_EXTERNAL_CALLERS_ONLY;
+#endif
+
#define LIBXL_SUSPEND_DEBUG 1
#define LIBXL_SUSPEND_LIVE 2
+#define LIBXL_SUSPEND_NO_FINAL_SUSPEND 4
/* @param suspend_cancel [from xenctrl.h:xc_domain_resume( @param fast )]
* If this parameter is true, use co-operative resume. The guest
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -1240,6 +1240,7 @@ void libxl__domain_suspend(libxl__egc *e
dss->xcflags = (live ? XCFLAGS_LIVE : 0)
| (debug ? XCFLAGS_DEBUG : 0)
+ | (dss->xlflags & LIBXL_SUSPEND_NO_FINAL_SUSPEND ?
XCFLAGS_DOMSAVE_NOSUSPEND : 0)
| (dss->hvm ? XCFLAGS_HVM : 0);
dss->suspend_eventchn = -1;
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2253,6 +2253,9 @@ struct libxl__domain_suspend_state {
xc_evtchn *xce; /* event channel handle */
int suspend_eventchn;
int hvm;
+ int max_iters;
+ int max_factor;
+ int xlflags;
int xcflags;
int guest_responded;
const char *dm_savefile;
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/libxl_save_callout.c
--- a/tools/libxl/libxl_save_callout.c
+++ b/tools/libxl/libxl_save_callout.c
@@ -108,8 +108,8 @@ void libxl__xc_domain_save(libxl__egc *e
}
const unsigned long argnums[] = {
- dss->domid, 0, 0, dss->xcflags, dss->hvm, vm_generationid_addr,
- toolstack_data_fd, toolstack_data_len,
+ dss->domid, dss->max_iters, dss->max_factor, dss->xcflags, dss->hvm,
+ vm_generationid_addr, toolstack_data_fd, toolstack_data_len,
cbflags,
};
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3172,7 +3172,7 @@ static int save_domain(uint32_t domid, c
save_domain_core_writeconfig(fd, filename, config_data, config_len);
- int rc = libxl_domain_suspend(ctx, domid, fd, 0, NULL);
+ int rc = libxl_domain_suspend(ctx, domid, fd, 0, 0, 0, NULL);
close(fd);
if (rc < 0)
@@ -3332,6 +3332,7 @@ static void migrate_do_preamble(int send
}
static void migrate_domain(uint32_t domid, const char *rune, int debug,
+ int max_iters, int max_factor, int no_suspend,
const char *override_config_file)
{
pid_t child = -1;
@@ -3360,7 +3361,10 @@ static void migrate_domain(uint32_t domi
if (debug)
flags |= LIBXL_SUSPEND_DEBUG;
- rc = libxl_domain_suspend(ctx, domid, send_fd, flags, NULL);
+ if (no_suspend)
+ flags |= LIBXL_SUSPEND_NO_FINAL_SUSPEND;
+
+ rc = libxl_domain_suspend(ctx, domid, send_fd, flags, max_iters,
max_factor, NULL);
if (rc) {
fprintf(stderr, "migration sender: libxl_domain_suspend failed"
" (rc=%d)\n", rc);
@@ -3753,8 +3757,16 @@ int main_migrate(int argc, char **argv)
char *rune = NULL;
char *host;
int opt, daemonize = 1, monitor = 1, debug = 0;
-
- SWITCH_FOREACH_OPT(opt, "FC:s:ed", NULL, "migrate", 2) {
+ int max_iters = 0, max_factor = 0, no_suspend = 0;
+ static struct option opts[] = {
+ {"max_iters", 1, 0, 'M'},
+ {"max_factor", 1, 0, 'm'},
+ {"no_suspend", 0, 0, 'N'},
+ COMMON_LONG_OPTS,
+ {0, 0, 0, 0}
+ };
+
+ SWITCH_FOREACH_OPT(opt, "FC:s:edM:m:N", opts, "migrate", 2) {
case 'C':
config_filename = optarg;
break;
@@ -3771,6 +3783,15 @@ int main_migrate(int argc, char **argv)
case 'd':
debug = 1;
break;
+ case 'M':
+ max_iters = atoi(optarg);
+ break;
+ case 'm':
+ max_factor = atoi(optarg);
+ break;
+ case 'N':
+ no_suspend = 1;
+ break;
}
domid = find_domain(argv[optind]);
@@ -3786,7 +3807,7 @@ int main_migrate(int argc, char **argv)
return 1;
}
- migrate_domain(domid, rune, debug, config_filename);
+ migrate_domain(domid, rune, debug, max_iters, max_factor, no_suspend,
config_filename);
return 0;
}
diff -r 256d59b2bc8a -r bd1412703913 tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c
+++ b/tools/libxl/xl_cmdtable.c
@@ -147,14 +147,19 @@ struct cmd_spec cmd_table[] = {
&main_migrate, 0, 1,
"Migrate a domain to another host",
"[options] <Domain> <host>",
- "-h Print this help.\n"
- "-C <config> Send <config> instead of config file from creation.\n"
- "-s <sshcommand> Use <sshcommand> instead of ssh. String will be
passed\n"
- " to sh. If empty, run <host> instead of ssh <host> xl\n"
- " migrate-receive [-d -e]\n"
- "-e Do not wait in the background (on <host>) for the
death\n"
- " of the domain.\n"
- "-d Print huge (!) amount of debug during the migration
process."
+ "-h Print this help.\n"
+ "-C <config> Send <config> instead of config file from creation.\n"
+ "-s <sshcommand> Use <sshcommand> instead of ssh. String will be
passed\n"
+ " to sh. If empty, run <host> instead of ssh <host> xl\n"
+ " migrate-receive [-d -e]\n"
+ "-e Do not wait in the background (on <host>) for the
death\n"
+ " of the domain.\n"
+ "-d Print huge (!) amount of debug during the migration
process.\n"
+ "-M <number> Number of iterations before final suspend (default:
30)\n"
+ "--max_iters <number>\n"
+ "-m <factor> Max amount of memory to transfer before final suspend
(default: 3*RAM).\n"
+ "--max_factor <factor>\n"
+ "-N, --no_suspend Abort migration instead of doing final suspend."
},
{ "dump-core",
&main_dump_core, 0, 1,
diff -r 256d59b2bc8a -r bd1412703913 tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -118,9 +118,19 @@ def save(fd, dominfo, network, live, dst
# enabled. Passing "0" simply uses the defaults compiled into
# libxenguest; see the comments and/or code in xc_linux_save() for
# more information.
+ max_iters = dominfo.info.get('max_iters', "0")
+ max_factor = dominfo.info.get('max_factor', "0")
+ no_suspend = dominfo.info.get('no_suspend', None)
+ if max_iters == "None":
+ max_iters = "0"
+ if max_factor == "None":
+ max_factor = "0"
+ if no_suspend == "None":
+ no_suspend = "0"
cmd = [xen.util.auxbin.pathTo(XC_SAVE), str(fd),
- str(dominfo.getDomid()), "0", "0",
- str(int(live) | (int(hvm) << 2)) ]
+ str(dominfo.getDomid()),
+ max_iters, max_factor,
+ str(int(live) | (int(hvm) << 2) | (int(no_suspend) << 5)) ]
log.debug("[xc_save]: %s", string.join(cmd))
def saveInputHandler(line, tochild):
diff -r 256d59b2bc8a -r bd1412703913 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -1832,6 +1832,18 @@ class XendDomain:
log.exception(ex)
raise XendError(str(ex))
+ def domain_migrate_constraints_set((self, domid, max_iters, max_factor,
no_suspend):
+ """Set the Migrate Constraints of this domain.
+ @param domid: Domain ID or Name
+ @param max_iters: Number of iterations before final suspend
+ @param max_factor: Max amount of memory to transfer before final
suspend
+ @param no_suspend: Abort migration instead of doing final suspend
+ """
+ dominfo = self.domain_lookup_nr(domid)
+ if not dominfo:
+ raise XendInvalidDomain(str(domid))
+ dominfo.setMigrateConstraints(max_iters, max_factor, no_suspend)
+
def domain_maxmem_set(self, domid, mem):
"""Set the memory limit for a domain.
diff -r 256d59b2bc8a -r bd1412703913 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1459,6 +1459,18 @@ class XendDomainInfo:
pci_conf = self.info['devices'][dev_uuid][1]
return map(pci_dict_to_bdf_str, pci_conf['devs'])
+ def setMigrateConstraints(self, max_iters, max_factor, no_suspend):
+ """Set the Migrate Constraints of this domain.
+ @param max_iters: Number of iterations before final suspend
+ @param max_factor: Max amount of memory to transfer before final
suspend
+ @param no_suspend: Abort migration instead of doing final suspend
+ """
+ log.debug("Setting setMigrateConstraints of domain %s (%s) to '%s'
'%s' '%s'.",
+ self.info['name_label'], str(self.domid), max_iters,
max_factor, no_suspend)
+ self.info['max_iters'] = str(max_iters)
+ self.info['max_factor'] = str(max_factor)
+ self.info['no_suspend'] = str(no_suspend)
+
def setMemoryTarget(self, target):
"""Set the memory target of this domain.
@param target: In MiB.
diff -r 256d59b2bc8a -r bd1412703913 tools/python/xen/xm/migrate.py
--- a/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@ -55,6 +55,18 @@ gopts.opt('change_home_server', short='c
fn=set_true, default=0,
use="Change home server for managed domains.")
+gopts.opt('max_iters', short='M', val='max_iters',
+ fn=set_int, default=None,
+ use="Number of iterations before final suspend (default: 30).")
+
+gopts.opt('max_factor', short='m', val='max_factor',
+ fn=set_int, default=None,
+ use="Max amount of memory to transfer before final suspend (default:
3*RAM).")
+
+gopts.opt('no_suspend', short='S',
+ fn=set_true, default=None,
+ use="Abort migration instead of doing final suspend.")
+
def help():
return str(gopts)
@@ -80,6 +92,10 @@ def main(argv):
server.xenapi.VM.migrate(vm_ref, dst, bool(opts.vals.live),
other_config)
else:
+ server.xend.domain.migrate_constraints_set(dom,
+ opts.vals.max_iters,
+ opts.vals.max_factor,
+ opts.vals.no_suspend)
server.xend.domain.migrate(dom, dst, opts.vals.live,
opts.vals.port,
opts.vals.node,
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |