Domain Groups: xend classes for groups
PATCH 2/8 Domain Groups: xend classes for groups
xend:
Augment Xend with classes and framework to manage group instances and persistent data.
tools/python/xen/xend/XendCheckpoint.py +42 -7
@@ -68,9 +68,16 @@ def save(fd, dominfo, network, live, dst try: dominfo.migrateDevices(network, dst, DEV_MIGRATE_STEP1, domain_name) - write_exact(fd, pack("!i", len(config)), - "could not write guest state file: config len") + dgid = dominfo.info['dgid'] + xdg = xen.xend.XendDomainGroup.instance() + grpinfo = xdg.grp_lookup_nr(dgid) + grpconfig = sxp.to_string(grpinfo.sxpr()) + + write_exact(fd, pack("!i", len(config)), "could not write guest state file: config len") write_exact(fd, config, "could not write guest state file: config") + + write_exact(fd, pack("!i", len(grpconfig)), "could not write group state file: grpconfig len") + write_exact(fd, grpconfig, "could not write group state file: grpconfig") image_cfg = dominfo.info.get('image', {}) hvm = image_cfg.has_key('hvm')
@@ -170,23 +177,50 @@ def restore(xd, fd, dominfo = None, paus raise XendError("not a valid guest state file: found '%s'" % signature) - l = read_exact(fd, sizeof_int, - "not a valid guest state file: config size read") + l = read_exact(fd, sizeof_int, "not a valid guest state file: config size read") vmconfig_size = unpack("!i", l)[0] - vmconfig_buf = read_exact(fd, vmconfig_size, - "not a valid guest state file: config read") + vmconfig_buf = read_exact(fd, vmconfig_size, "not a valid guest state file: config read") + + l = read_exact(fd, sizeof_int, "not a valid group state file: grpconfig size read") + grpconfig_size = unpack("!i", l)[0] + grpconfig_buf = read_exact(fd, grpconfig_size, "not a valid group state file: config read") p = sxp.Parser() p.input(vmconfig_buf) if not p.ready: raise XendError("not a valid guest state file: config parse") - vmconfig = p.get_val() + + p.reset() + p.input(grpconfig_buf) + if not p.ready: + raise XendError("not a valid group state file: config parse") + grpconfig = eval(p.get_val()) if dominfo: dominfo.resume() else: dominfo = xd.restore_(vmconfig) + + src_dguuid = sxp.child_value(vmconfig, 'dguuid') + src_grp_name = grpconfig['grp_name'] + + xdg = xen.xend.XendDomainGroup.instance() + xdg.domain_groups_lock.acquire() + try: + grpinfo = xdg.grp_lookup(src_dguuid) + if not grpinfo: + grpcfg = {} + grpcfg['dguuid'] = src_dguuid + grpcfg['grp_name'] = src_grp_name + grpinfo = xen.xend.XendDomainGroupInfo.XendDomainGroupInfo(grpcfg) + grpinfo.construct(src_dguuid) + xdg.grp_join(dominfo.getDomid(), grpinfo.info['dgid']) + xdg.domain_groups_lock.release() + except: + xdg.domain_groups_lock.release() + dominfo.destroy() + raise store_port = dominfo.getStorePort() console_port = dominfo.getConsolePort()
@@ -246,6 +280,7 @@ def restore(xd, fd, dominfo = None, paus raise XendError('Could not read console MFN') dominfo.waitForDevices() # Wait for backends to set up + if not paused: dominfo.unpause()
tools/python/xen/xend/XendClient.py +1 -0
@@ -27,6 +27,7 @@ ERROR_INTERNAL = 1 ERROR_INTERNAL = 1 ERROR_GENERIC = 2 ERROR_INVALID_DOMAIN = 3 +ERROR_INVALID_DOMAIN_GROUP = 4 uri = 'httpu:///var/run/xend/xmlrpc.sock' if os.environ.has_key('XM_SERVER'):
tools/python/xen/xend/XendConfig.py +23 -2
@@ -25,7 +25,7 @@ from xen.xend.XendError import VmError from xen.xend.XendError import VmError from xen.xend.XendDevices import XendDevices from xen.xend.PrettyPrint import prettyprintstring -from xen.xend.XendConstants import DOM_STATE_HALTED +from xen.xend.XendConstants import DOM_STATE_HALTED,NULL_GROUP_ID,NULL_GROUP_UUID log = logging.getLogger("xend.XendConfig") log.setLevel(logging.DEBUG)
@@ -103,6 +103,8 @@ def scrub_password(data): XENAPI_CFG_TO_LEGACY_CFG = { 'uuid': 'uuid', + 'dgid': 'dgid', + 'dguuid': 'dguuid', 'vcpus_number': 'vcpus', 'cpus': 'cpus', 'memory_static_min': 'memory',
@@ -133,6 +135,8 @@ XENAPI_HVM_CFG = { XENAPI_CFG_TYPES = { 'uuid': str, + 'dgid': int, + 'dguuid': str, 'power_state': str, 'name_label': str, 'name_description': str,
@@ -196,6 +200,9 @@ LEGACY_UNSUPPORTED_BY_XENAPI_CFG = [ LEGACY_CFG_TYPES = { 'uuid': str, + 'dgid': int, + 'dguuid': str, + 'grp_name': str, 'name': str, 'vcpus': int, 'vcpu_avail': long,
@@ -222,6 +229,8 @@ LEGACY_CFG_TYPES = { # xenstore. LEGACY_XENSTORE_VM_PARAMS = [ 'uuid', + 'dgid', + 'dguuid', 'name', 'vcpus', 'vcpu_avail',
@@ -377,6 +386,8 @@ class XendConfig(dict): 'vbd_refs': [], 'vtpm_refs': [], 'other_config': {}, + 'dgid': NULL_GROUP_ID, + 'dguuid': NULL_GROUP_UUID, } return defaults
@@ -412,6 +423,10 @@ class XendConfig(dict): self['uuid'] = uuid.createString() else: self['uuid'] = uuid.toString(uuid.fromString(self['uuid'])) + if 'dguuid' not in self or not self['dguuid']: + self['dguuid'] = uuid.createString() + else: + self['dguuid'] = uuid.toString(uuid.fromString(self['dguuid'])) def _name_sanity_check(self): if 'name_label' not in self:
@@ -426,6 +441,7 @@ class XendConfig(dict): def _dominfo_to_xapi(self, dominfo): self['domid'] = dominfo['domid'] + self['dgid'] = dominfo['dgid'] self['online_vcpus'] = dominfo['online_vcpus'] self['vcpus_number'] = dominfo['max_vcpu_id'] + 1 self['memory_dynamic_min'] = (dominfo['mem_kb'] + 1023)/1024
@@ -449,6 +465,9 @@ class XendConfig(dict): if 'handle' in dominfo: self['uuid'] = uuid.toString(dominfo['handle']) + + if 'dg_handle' in dominfo: + self['dguuid'] = uuid.toString(dominfo['dg_handle']) def _parse_sxp(self, sxp_cfg): """ Populate this XendConfig using the parsed SXP.
@@ -879,9 +898,11 @@ class XendConfig(dict): sxpr.append([legacy, int(self[xenapi])]) else: sxpr.append([legacy, self[xenapi]]) + else: + log.debug("Unconverted key: " + xenapi) for legacy in LEGACY_UNSUPPORTED_BY_XENAPI_CFG: - if legacy in ('domid', 'uuid'): # skip these + if legacy in ('domid', 'uuid', 'dgid', 'dguuid'): # skip these continue if self.has_key(legacy) and self[legacy] not in (None, []): sxpr.append([legacy, self[legacy]])
tools/python/xen/xend/XendConstants.py +11 -0
@@ -102,4 +102,15 @@ VTPM_DELETE_SCRIPT = '/etc/xen/scripts/v # XS_VMROOT = "/vm/" +XS_GRPROOT = "/group/" +# +# Domain Group Constants +# + +GROUP0_ID = 0 +GROUP0_UUID = "00000000-0000-0000-0000-000000000000" +GROUP0_NAME = "Group-0" +NULL_GROUP_ID = 32767 +NULL_GROUP_UUID = "ffffffff-ffff-ffff-ffff-ffffffffffff" +NULL_GROUP_NAME = "Null-Group"
tools/python/xen/xend/XendDomain.py +9 -1
@@ -415,6 +415,9 @@ class XendDomain: if domid not in running_domids and domid != DOM0_ID: self.remove_domain(dom, domid) + # update group information + xen.xend.XendDomainGroup.instance().refresh() + def add_domain(self, info): """Add a domain to the list of running domains
@@ -846,10 +849,15 @@ class XendDomain: oflags = os.O_RDONLY if hasattr(os, "O_LARGEFILE"): oflags |= os.O_LARGEFILE - XendCheckpoint.restore(self, + updated_dominfo = XendCheckpoint.restore(self, os.open(chkpath, oflags), dominfo, paused = start_paused) + domid = dominfo.getDomid() + dgid = dominfo.getOldDgid() + xdg = xen.xend.XendDomainGroup.instance() + xdg.grp_join(domid, dgid) + self._add_domain(updated_dominfo) os.unlink(chkpath) except OSError, ex: raise XendError("Failed to read stored checkpoint file")
tools/python/xen/xend/XendDomainInfo.py +21 -5
@@ -341,7 +341,7 @@ class XendDomainInfo: self.domid = self.info.get('domid') else: self.domid = domid - + #REMOVE: uuid is now generated in XendConfig #if not self._infoIsSet('uuid'): # self.info['uuid'] = uuid.toString(uuid.create())
@@ -768,6 +768,8 @@ class XendDomainInfo: def _storeDomDetails(self): to_store = { 'domid': str(self.domid), + 'dgid': str(self.info['dgid']), + 'dguuid': self.info['dguuid'], 'vm': self.vmpath, 'name': self.info['name_label'], 'console/limit': str(xoptions.get_console_limit() * 1024),
@@ -823,7 +825,8 @@ class XendDomainInfo: # Check whether values in the configuration have # changed in Xenstore. - cfg_vm = ['name', 'on_poweroff', 'on_reboot', 'on_crash'] + cfg_vm = ['name', 'on_poweroff', 'on_reboot', 'on_crash', 'dgid', + 'dguuid', 'grp_name'] vm_details = self._readVMDetails([(k,XendConfig.LEGACY_CFG_TYPES[k]) for k in cfg_vm])
@@ -855,6 +858,8 @@ class XendDomainInfo: log.debug('XendDomainInfo.handleShutdownWatch') reason = self.readDom('control/shutdown') + # stash current dgid so it can be used during domain restart + self.old_dgid = self.info.get('dgid') if reason and reason != 'suspend': sst = self.readDom('xend/shutdown_start_time')
@@ -882,6 +887,12 @@ class XendDomainInfo: def getDomid(self): return self.domid + + def getDgid(self): + return self.info.get('dgid') + + def getOldDgid(self): + return self.old_dgid def setName(self, name): self._checkName(name)
@@ -1115,7 +1126,7 @@ class XendDomainInfo: False if it is to be destroyed. """ from xen.xend import XendDomain - + if self._readVm(RESTART_IN_PROGRESS): log.error('Xend failed during restart of domain %s. ' 'Refusing to restart to avoid loops.',
@@ -1158,6 +1169,11 @@ class XendDomainInfo: try: new_dom = XendDomain.instance().domain_create_from_dict( self.info) + + # rejoin former domain group + xdg = xen.xend.XendDomainGroup.instance() + xdg.grp_join(new_dom.domid, self.old_dgid) + new_dom.unpause() rst_cnt = self._readVm('xend/restart_count') rst_cnt = int(rst_cnt) + 1
@@ -2345,8 +2361,8 @@ class XendDomainInfo: return (dev_uuid in self.info['%s_refs' % dev_class.lower()]) def __str__(self): - return '<domain id=%s name=%s memory=%s state=%s>' % \ - (str(self.domid), self.info['name_label'], + return '<domain id=%s dgid=%s name=%s memory=%s state=%s>' % \ + (str(self.domid), str(self.info.get('dgid')), self.info['name_label'], str(self.info['memory_static_min']), DOM_STATES[self.state]) __repr__ = __str__
tools/python/xen/xend/XendError.py +4 -0
@@ -22,6 +22,10 @@ class XendInvalidDomain(Fault): class XendInvalidDomain(Fault): def __init__(self, value): Fault.__init__(self, XendClient.ERROR_INVALID_DOMAIN, value) + +class XendInvalidDomainGroup(Fault): + def __init__(self, value): + Fault.__init__(self, XendClient.ERROR_INVALID_DOMAIN_GROUP, value) class XendError(Fault):
tools/python/xen/xend/server/XMLRPCServer.py +30 -4
@@ -24,10 +24,11 @@ from xen.util.xmlrpclib2 import UnixXMLR from xen.xend import XendAPI, XendDomain, XendDomainInfo, XendNode from xen.xend import XendLogging, XendDmesg +from xen.xend import XendDomainGroup from xen.xend.XendClient import XML_RPC_SOCKET from xen.xend.XendConstants import DOM_STATE_RUNNING from xen.xend.XendLogging import log -from xen.xend.XendError import XendInvalidDomain +from xen.xend.XendError import XendInvalidDomain, XendInvalidDomainGroup # vcpu_avail is a long and is not needed by the clients. It's far easier # to just remove it then to try and marshal the long.
@@ -41,18 +42,18 @@ def fixup_sxpr(sexpr): ret.append(k) return ret -def lookup(domid): +def lookup_dom(domid): info = XendDomain.instance().domain_lookup(domid) if not info: raise XendInvalidDomain(str(domid)) return info def dispatch(domid, fn, args): - info = lookup(domid) + info = lookup_dom(domid) return getattr(info, fn)(*args) def domain(domid, full = 0): - info = lookup(domid) + info = lookup_dom(domid) return fixup_sxpr(info.sxpr(not full)) def domains(detail = True, full = False):
@@ -73,6 +74,19 @@ def domain_restore(src, paused=False): info = XendDomain.instance().domain_restore(src, paused) return fixup_sxpr(info.sxpr()) +def lookup_grp(dgid): + grpinfo = XendDomainGroup.instance().grp_lookup(dgid) + if not grpinfo: + raise XendInvalidDomainGroup("Invalid group: %s" % str(dgid)) + return grpinfo + +def group(dgid): + return lookup_grp(dgid) + +def group_create(config): + info = XendDomainGroup.instance().grp_create(config) + return info.sxpr() + def get_log(): f = open(XendLogging.getLogFilename(), 'r') try:
@@ -87,6 +101,10 @@ methods = ['device_create', 'device_conf 'getRestartCount'] exclude = ['domain_create', 'domain_restore'] + +grp_methods = ['grp_destroy', 'grp_pause', 'grp_unpause', 'grp_members', + 'grp_join', 'grp_migrate', 'grp_list', 'grp_suspend', + 'grp_resume', 'grp_save', 'grp_restore', 'grp_shutdown'] class XMLRPCServer: def __init__(self, auth, use_xenapi, use_tcp=False, host = "localhost",
@@ -158,6 +176,12 @@ class XMLRPCServer: if name not in exclude: self.server.register_function(fn, "xend.domain.%s" % name[7:]) + # Domain Group Operations + xdg_inst = XendDomainGroup.instance() + for name in grp_methods: + fn = getattr(xdg_inst, name) + self.server.register_function(fn, "xend.group.%s" % name[4:]) + # Functions in XendNode and XendDmesg for type, lst, n in [(XendNode, ['info'], 'node'), (XendDmesg, ['info', 'clear'], 'node.dmesg')]:
@@ -174,6 +198,8 @@ class XMLRPCServer: self.server.register_function(get_log, 'xend.node.log') self.server.register_function(domain_create, 'xend.domain.create') self.server.register_function(domain_restore, 'xend.domain.restore') + self.server.register_function(group, 'xend.group') + self.server.register_function(group_create, 'xend.group.create') self.server.register_introspection_functions() self.ready = True
tools/python/xen/xend/XendDomainGroup.py new file +345 -0
345 lines not on this page · raw message
tools/python/xen/xend/XendDomainGroupInfo.py new file +239 -0
239 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel