From: Keir Fraser Date: Thu, 12 Mar 2009 11:07:34 +0000 (+0000) Subject: xend: Crash the domain if qemu-dm stops running X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~97 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d88a38225c79424147ca6ae88ae48e7d01a4613b;p=xen.git 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 --- diff --git a/tools/python/xen/xend/XendConstants.py b/tools/python/xen/xend/XendConstants.py index 3130f75c08..fa72edc5af 100644 --- a/tools/python/xen/xend/XendConstants.py +++ b/tools/python/xen/xend/XendConstants.py @@ -96,7 +96,7 @@ SHUTDOWN_TIMEOUT = (60.0 * 5) 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 --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 7260551069..d028e45776 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -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: