# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1178187778 -3600
# Node ID c857bf38f0157cb31fe9bdf8f0161047063c0fd1
# Parent 24f47ff4fb25f40e586e9b56f39fb442172e7f1e
xend: Revert changeset 15002. Breaks xend restart in some cases.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/python/xen/xend/server/SrvDaemon.py | 2 +-
tools/python/xen/xend/server/SrvServer.py | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff -r 24f47ff4fb25 -r c857bf38f015 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Thu May 03 09:33:12 2007 +0100
+++ b/tools/python/xen/xend/server/SrvDaemon.py Thu May 03 11:22:58 2007 +0100
@@ -342,7 +342,7 @@ class Daemon:
log.info("Xend version: Unknown.")
relocate.listenRelocation()
- servers = SrvServer.create(status)
+ servers = SrvServer.create()
servers.start(status)
del servers
diff -r 24f47ff4fb25 -r c857bf38f015 tools/python/xen/xend/server/SrvServer.py
--- a/tools/python/xen/xend/server/SrvServer.py Thu May 03 09:33:12 2007 +0100
+++ b/tools/python/xen/xend/server/SrvServer.py Thu May 03 11:22:58 2007 +0100
@@ -95,6 +95,14 @@ class XendServers:
self.cleanup(signum, frame, reloading = True)
def start(self, status):
+ # Running the network script will spawn another process, which takes
+ # the status fd with it unless we set FD_CLOEXEC. Failing to do this
+ # causes the read in SrvDaemon to hang even when we have written here.
+ if status:
+ fcntl.fcntl(status, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
+
+ Vifctl.network('start')
+
# Prepare to catch SIGTERM (received when 'xend stop' is executed)
# and call each server's cleanup if possible
signal.signal(signal.SIGTERM, self.cleanup)
@@ -241,15 +249,7 @@ def _loadConfig(servers, root, reload):
servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False))
-def create(status):
- # Running the network script will spawn another process, which takes
- # the status fd with it unless we set FD_CLOEXEC. Failing to do this
- # causes the read in SrvDaemon to hang even when we have written here.
- if status:
- fcntl.fcntl(status, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-
- Vifctl.network('start')
-
+def create():
root = SrvDir()
root.putChild('xend', SrvRoot())
servers = XendServers(root)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home