[Xen-changelog] [xen-unstable] xend: Crash the domain if qemu-dm stops running

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236856054 0
# Node ID 1ad8216abda5487c2d53c1a713f2ff68b95c06cd
# Parent  e2de0e760a0db883112635ea200292991bca3714
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@xxxxxxx>
---
 tools/python/xen/xend/XendConstants.py |    2 +-
 tools/python/xen/xend/image.py         |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff -r e2de0e760a0d -r 1ad8216abda5 tools/python/xen/xend/XendConstants.py
--- a/tools/python/xen/xend/XendConstants.py    Thu Mar 12 11:07:00 2009 +0000
+++ b/tools/python/xen/xend/XendConstants.py    Thu Mar 12 11:07:34 2009 +0000
@@ -96,7 +96,7 @@ ZOMBIE_PREFIX = 'Zombie-'
 ZOMBIE_PREFIX = 'Zombie-'
 
 """Minimum time between domain restarts in seconds."""
-MINIMUM_RESTART_TIME = 20
+MINIMUM_RESTART_TIME = 60
 
 RESTART_IN_PROGRESS = 'xend/restart_in_progress'
 DUMPCORE_IN_PROGRESS = 'xend/dumpcore_in_progress'
diff -r e2de0e760a0d -r 1ad8216abda5 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Thu Mar 12 11:07:00 2009 +0000
+++ b/tools/python/xen/xend/image.py    Thu Mar 12 11:07:34 2009 +0000
@@ -487,11 +487,7 @@ class ImageHandler:
 
     def _dmfailed(self, message):
         log.warning("domain %s: %s", self.vm.getName(), message)
-        # ideally we would like to forcibly crash the domain with
-        # something like
-        #    xc.domain_shutdown(self.vm.getDomid(), DOMAIN_CRASH)
-        # but this can easily lead to very rapid restart loops against
-        # which we currently have no protection
+        xc.domain_shutdown(self.vm.getDomid(), DOMAIN_CRASH)
 
     def recreate(self):
         if self.device_model is None:

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