ia64/xen-unstable

changeset 19334:1ad8216abda5

xend: Crash the domain if qemu-dm stops running

The comment about the lack of restart prevention is not accurate.

Bump the minimum restart time to 60 seconds.

Signed-off-by: John Levon <john.levon@sun.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 12 11:07:34 2009 +0000 (2009-03-12)
parents e2de0e760a0d
children b3b6aee082d6
files tools/python/xen/xend/XendConstants.py tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConstants.py	Thu Mar 12 11:07:00 2009 +0000
     1.2 +++ b/tools/python/xen/xend/XendConstants.py	Thu Mar 12 11:07:34 2009 +0000
     1.3 @@ -96,7 +96,7 @@ SHUTDOWN_TIMEOUT = (60.0 * 5)
     1.4  ZOMBIE_PREFIX = 'Zombie-'
     1.5  
     1.6  """Minimum time between domain restarts in seconds."""
     1.7 -MINIMUM_RESTART_TIME = 20
     1.8 +MINIMUM_RESTART_TIME = 60
     1.9  
    1.10  RESTART_IN_PROGRESS = 'xend/restart_in_progress'
    1.11  DUMPCORE_IN_PROGRESS = 'xend/dumpcore_in_progress'
     2.1 --- a/tools/python/xen/xend/image.py	Thu Mar 12 11:07:00 2009 +0000
     2.2 +++ b/tools/python/xen/xend/image.py	Thu Mar 12 11:07:34 2009 +0000
     2.3 @@ -487,11 +487,7 @@ class ImageHandler:
     2.4  
     2.5      def _dmfailed(self, message):
     2.6          log.warning("domain %s: %s", self.vm.getName(), message)
     2.7 -        # ideally we would like to forcibly crash the domain with
     2.8 -        # something like
     2.9 -        #    xc.domain_shutdown(self.vm.getDomid(), DOMAIN_CRASH)
    2.10 -        # but this can easily lead to very rapid restart loops against
    2.11 -        # which we currently have no protection
    2.12 +        xc.domain_shutdown(self.vm.getDomid(), DOMAIN_CRASH)
    2.13  
    2.14      def recreate(self):
    2.15          if self.device_model is None: