fixes for suspend & resume
PATCH 1/1 fixes for suspend & resume
This patch does two things to improve the current condition of suspend and resume:
1. Register 'xm resume' with the xm command line argument parser so the corresponding xm_resume() function will be called.
2. Allow users to supply either a domain name, domid, or uuid to identify the target of a suspend or resume operation (instead of how it is now, where only a uuid will work).
There's at least one additional problem (that this patch doesn't address) effecting domains that are started, suspended, resumed, and finally shutdown. Affected domains remain in the xend's list of running domains when instead they should revert back to a dormant state with domid of -1. A work around is to restart xend after the effected domains have been shutdown, which causes the domains to correctly appear as dormant, but clearly this restart shouldn't be necessary.
-Chris
tools/python/xen/xend/XendDomain.py +3 -3
@@ -751,11 +751,11 @@ class XendDomain: if dominfo.state != DOM_STATE_RUNNING: raise XendError("Cannot suspend domain that is not running.") - if not os.path.exists(self._managed_config_path(domname)): + if not os.path.exists(self._managed_config_path(dominfo.get_uuid())): raise XendError("Domain is not managed by Xend lifecycle " + "support.") - path = self._managed_check_point_path(domname) + path = self._managed_check_point_path(dominfo.get_uuid()) fd = os.open(path, os.O_WRONLY | os.O_CREAT | os.O_TRUNC) try: # For now we don't support 'live checkpoint'
@@ -786,7 +786,7 @@ class XendDomain: if dominfo.state != DOM_STATE_HALTED: raise XendError("Cannot suspend domain that is not running.") - chkpath = self._managed_check_point_path(domname) + chkpath = self._managed_check_point_path(dominfo.get_uuid()) if not os.path.exists(chkpath): raise XendError("Domain was not suspended by Xend")
tools/python/xen/xm/main.py +1 -0
@@ -1415,6 +1415,7 @@ commands = { "sysrq": xm_sysrq, "uptime": xm_uptime, "suspend": xm_suspend, + "resume": xm_resume, "list": xm_list, # memory commands "mem-max": xm_mem_max,
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 11 lines · Chris
This patch does two things to improve the current condition of suspend and resume:
1. Register 'xm resume' with the xm command line argument parser so the corresponding
xm_resume()function will be called.2. Allow users to supply either a domain name, domid, or uuid to identify the target of a suspend or resume operation (instead of how it is now, where only a uuid will work).
Signed-off-by Chris Bookholt <[email protected]>
Apologies are due to Chris for apparently plagiarising this patch -- I had missed his fixes and then subsequently addressed those same problems myself.
Sorry about that,
Ewan.
Quoted 7 lines · Chris
There's at least one additional problem (that this patch doesn't address) effecting domains that are started, suspended, resumed, and finally shutdown. Affected domains remain in the xend's list of running domains when instead they should revert back to a dormant state with domid of -1. A work around is to restart xend after the effected domains have been shutdown, which causes the domains to correctly appear as dormant, but clearly this restart shouldn't be necessary.
I believe that this is fixed (or certainly, it's better) with xen-unstable changeset 12566.
Ewan.
Quoted 10 lines · Ewan Mellor
Quoted 7 lines · Chris
There's at least one additional problem (that this patch doesn't address) effecting domains that are started, suspended, resumed, and finally shutdown. Affected domains remain in the xend's list of running domains when instead they should revert back to a dormant state with domid of -1. A work around is to restart xend after the effected domains have been shutdown, which causes the domains to correctly appear as dormant, but clearly this restart shouldn't be necessary.
Quoted 5 lines
I believe that this is fixed (or certainly, it's better) with xen-unstable changeset 12566.
Ewan.
I think you're right; seems to be fixed from what I can tell.
However, I think found another problem. :) Rebooting a managed domain seems to fail with an exception that the rebooted domain's name already exists.
Clearly, the managed domain's name does and should exist to Xend because it's hanging out in the lifecycle area.
There's a call to checkName() in XendDomainInfo's __init__() method that's the source of the exception, though I'm debating the merits of where to make changes. It might be enough to relax checkName() to allow creation of XendDomainInfo instances with non-unique domain names if they only conflict with managed domains that are not running and soon to be replaced. Although, it would seem more safe if an existing XendDomainInfo instance were re-used when a reboot occurs.
Any thoughts?
Hopefully I can figure out how to implement the latter approach in the next day or two.
Cheers
-Chris
Quoted 34 lines · Chris
Quoted 10 lines · Ewan Mellor
Quoted 7 lines · Chris
There's at least one additional problem (that this patch doesn't address) effecting domains that are started, suspended, resumed, and finally shutdown. Affected domains remain in the xend's list of running domains when instead they should revert back to a dormant state with domid of -1. A work around is to restart xend after the effected domains have been shutdown, which causes the domains to correctly appear as dormant, but clearly this restart shouldn't be necessary.
Quoted 5 lines
I believe that this is fixed (or certainly, it's better) with xen-unstable changeset 12566.
Ewan.
I think you're right; seems to be fixed from what I can tell.
However, I think found another problem. :) Rebooting a managed domain seems to fail with an exception that the rebooted domain's name already exists.
Clearly, the managed domain's name does and should exist to Xend because it's hanging out in the lifecycle area.
There's a call to
checkName()in XendDomainInfo's__init__()method that's the source of the exception, though I'm debating the merits of where to make changes. It might be enough to relaxcheckName()to allow creation of XendDomainInfo instances with non-unique domain names if they only conflict with managed domains that are not running and soon to be replaced. Although, it would seem more safe if an existing XendDomainInfo instance were re-used when a reboot occurs.
Quoted 1 line
Any thoughts?
Yes, you're right. I think we're relying upon the fact that the XendDomainInfo instances aren't necessarily unique, so I've put a fix in comparing the UUIDs of the VMs as specified on that instance. That should do the trick.
Cheers,
Ewan.
Quoted 34 lines · Ewan Mellor
Quoted 32 lines · Chris
Quoted 9 lines · Ewan Mellor
Quoted 7 lines · Chris
There's at least one additional problem (that this patch doesn't address) effecting domains that are started, suspended, resumed, and finally shutdown. Affected domains remain in the xend's list of running domains when instead they should revert back to a dormant state with domid of -1. A work around is to restart xend after the effected domains have been shutdown, which causes the domains to correctly appear as dormant, but clearly this restart shouldn't be necessary.
Quoted 5 lines
I believe that this is fixed (or certainly, it's better) with xen-unstable changeset 12566.
Ewan.
I think you're right; seems to be fixed from what I can tell.
However, I think found another problem. :) Rebooting a managed domain seems to fail with an exception that the rebooted domain's name already exists.
Clearly, the managed domain's name does and should exist to Xend because it's hanging out in the lifecycle area.
There's a call to
checkName()in XendDomainInfo's__init__()method that's the source of the exception, though I'm debating the merits of where to make changes. It might be enough to relaxcheckName()to allow creation of XendDomainInfo instances with non-unique domain names if they only conflict with managed domains that are not running and soon to be replaced. Although, it would seem more safe if an existing XendDomainInfo instance were re-used when a reboot occurs.
Quoted 6 lines
Quoted 1 line
Any thoughts?
Yes, you're right. I think we're relying upon the fact that the XendDomainInfo instances aren't necessarily unique, so I've put a fix in comparing the UUIDs of the VMs as specified on that instance. That should do the trick.
I'll be sure test your solution when it appears in the changelog list.
There may be more than one way to skin this cat; for grins here is another way to approach the name conflict issue. This patch checks to see if the domain being rebooted is managed and, if so, calls XendDomain.domain_start() instead of calling XendDomain.domain_create().
I think the main advantage is Xend doesn't tend toward creating
non-unique XendDomainInfo instances. This may not mean much now, but in the future it might be a useful property, especially if the XendDomain.domain_lookup() implementation ever changes. I'll leave that for you to decide.
That said, don't go replacing the patch you've written with this one because I hadn't finished working out the kinks yet. Just consider this submission food for thought.
Cheers
-Chris
tools/python/xen/xend/XendDomainInfo.py +9 -2
@@ -981,6 +981,7 @@ class XendDomainInfo: False if it is to be destroyed. """ from xen.xend import XendDomain + xd = XendDomain.instance() self._configureBootloader() config = self.sxpr()
@@ -997,6 +998,8 @@ class XendDomainInfo: return old_domid = self.domid + old_domname = self.info['name'] + dom_is_managed = xd.is_domain_managed(self) self._writeVm(RESTART_IN_PROGRESS, 'True') now = time.time()
@@ -1029,14 +1032,18 @@ class XendDomainInfo: new_dom = None try: - new_dom = XendDomain.instance().domain_create(config) + if dom_is_managed: + xd.domain_start(old_domname) + new_dom = xd.domain_lookup(old_domname) + else: + new_dom = xd.domain_create(config) new_dom.unpause() rst_cnt = self._readVm('xend/restart_count') rst_cnt = int(rst_cnt) + 1 self._writeVm('xend/restart_count', str(rst_cnt)) new_dom._removeVm(RESTART_IN_PROGRESS) except: - if new_dom: + if new_dom and not dom_is_managed: new_dom._removeVm(RESTART_IN_PROGRESS) new_dom.destroy() else:
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel