aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xend/XendConstants.py2
-rw-r--r--tools/python/xen/xend/image.py6
2 files changed, 2 insertions, 6 deletions
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: