Mailing List Archive

# HG changeset patch
# User kfraser@localhost.localdomain
# Date 1180084537 -3600
# Node ID d93e560c1d50afcf39c99a4211c20c8b9ce63c38
# Parent 16e376ed56389cd8abeba49ef03aa363d376fc0d
Do not destroy domains that timeout when shutting down.

Instead of violently destroying a domain that is not responding to a
shutdown request, rename the domain to indicate the problem and leave
it alone; this allows the admin to make corrective actions (which may
or may not include destroying the domain).

Signed-off-by: John Levon <john.levon@sun.com>
---
tools/python/xen/xend/XendDomainInfo.py | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)

diff -r 16e376ed5638 -r d93e560c1d50 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Thu May 24 15:45:43 2007 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py Fri May 25 10:15:37 2007 +0100
@@ -362,6 +362,7 @@ class XendDomainInfo:
self.vmWatch = None
self.shutdownWatch = None
self.shutdownStartTime = None
+ self.unresponsive = False
self._resume = resume

self.state_updated = threading.Condition()
@@ -1128,21 +1129,25 @@ class XendDomainInfo:
# failed. Ignore this domain.
pass
else:
- # Domain is alive. If we are shutting it down, then check
- # the timeout on that, and destroy it if necessary.
+ # Domain is alive.
if xeninfo['paused']:
self._stateSet(DOM_STATE_PAUSED)
else:
self._stateSet(DOM_STATE_RUNNING)

- if self.shutdownStartTime:
+ if self.shutdownStartTime and not self.unresponsive:
timeout = (SHUTDOWN_TIMEOUT - time.time() +
self.shutdownStartTime)
if timeout < 0:
+ # The domain is not responding to shutdown requests.
+ # Log a message, and rename the domain to indicate the
+ # state; we keep the domain running, however, to
+ # allow corrective action.
log.info(
"Domain shutdown timeout expired: name=%s id=%s",
self.info['name_label'], self.domid)
- self.destroy()
+ self.setName('unresponsive-' + self.getName())
+ self.unresponsive = True
finally:
self.refresh_shutdown_lock.release()

@@ -1431,6 +1436,7 @@ class XendDomainInfo:
log.debug('XendDomainInfo.constructDomain')

self.shutdownStartTime = None
+ self.unresponsive = False

hvm = self.info.is_hvm()
if hvm:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog