Mailing List Archive

# HG changeset patch
# User kfraser@localhost.localdomain
# Date 1180096861 -3600
# Node ID f2d2d5f18543de04191c1f5e22471e74d8767147
# Parent cf3cf0d1b175c399568cc44053a4dc3826baba2d
Revert 15164:d93e560c1d50afcf39c99a4211c20c8b9ce63c38
---
tools/python/xen/xend/XendDomainInfo.py | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)

diff -r cf3cf0d1b175 -r f2d2d5f18543 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Fri May 25 13:02:08 2007 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py Fri May 25 13:41:01 2007 +0100
@@ -362,7 +362,6 @@ class XendDomainInfo:
self.vmWatch = None
self.shutdownWatch = None
self.shutdownStartTime = None
- self.unresponsive = False
self._resume = resume

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

- if self.shutdownStartTime and not self.unresponsive:
+ if self.shutdownStartTime:
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.setName('unresponsive-' + self.getName())
- self.unresponsive = True
+ self.destroy()
finally:
self.refresh_shutdown_lock.release()

@@ -1436,7 +1431,6 @@ 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