ia64/xen-unstable

changeset 17739:634fe9f86d62

Revert 17731:eafb252f141.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue May 27 11:50:43 2008 +0100 (2008-05-27)
parents e265878e8f65
children 6b28a18a8c2d
files tools/python/xen/xend/server/SrvServer.py
line diff
     1.1 --- a/tools/python/xen/xend/server/SrvServer.py	Tue May 27 10:35:10 2008 +0100
     1.2 +++ b/tools/python/xen/xend/server/SrvServer.py	Tue May 27 11:50:43 2008 +0100
     1.3 @@ -44,7 +44,6 @@ import fcntl
     1.4  import re
     1.5  import time
     1.6  import signal
     1.7 -import os
     1.8  from threading import Thread
     1.9  
    1.10  from xen.web.httpserver import HttpServer, UnixHttpServer
    1.11 @@ -149,27 +148,14 @@ class XendServers:
    1.12  
    1.13              # Reaching this point means we can auto start domains
    1.14              try:
    1.15 -                dom = xenddomain()
    1.16 -                dom.autostart_domains()
    1.17 +                xenddomain().autostart_domains()
    1.18              except Exception, e:
    1.19                  log.exception("Failed while autostarting domains")
    1.20  
    1.21              # loop to keep main thread alive until it receives a SIGTERM
    1.22              self.running = True
    1.23              while self.running:
    1.24 -                # loop to destroy those hvm domain that whoes DM has dead unexpectedly.
    1.25 -                for item in dom.domains.values():
    1.26 -                    if item.info.is_hvm():
    1.27 -                        device_model_pid = item.gatherDom(('image/device-model-pid', str))
    1.28 -                        dm_stat_cmd = "ps -o stat --no-headers -p"+device_model_pid
    1.29 -                        dm_stat = os.popen(dm_stat_cmd).readline().rstrip()
    1.30 -                        if dm_stat == 'Z':
    1.31 -                            log.warn("Devices Model for domain " + str(item.domid) + "was killed unexpectedly")
    1.32 -                            item.info['crashed'] = 1
    1.33 -                            item.refreshShutdown(item.info)
    1.34 -                        else:
    1.35 -                            continue
    1.36 -                time.sleep(30)
    1.37 +                time.sleep(100000000)
    1.38                  
    1.39              if self.reloadingConfig:
    1.40                  log.info("Restarting all XML-RPC and Xen-API servers...")