From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony Liguori Subject: [PATCH 2/3] Remove the logic in Xend to start xenstored Date: Thu, 04 Aug 2005 11:04:26 -0500 Message-ID: <42F23C8A.6040002@us.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000709090503020208000202" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------000709090503020208000202 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Xend (the server) shouldn't be responsible for starting Xenstore as other things may also depend on it (like consoled). Signed-off-by: Anthony Liguori Regards, Anthony Liguori --------------000709090503020208000202 Content-Type: text/x-patch; name="xenstored_srvdaemon.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xenstored_srvdaemon.diff" diff -r 1d240086de52 tools/python/xen/xend/server/SrvDaemon.py --- a/tools/python/xen/xend/server/SrvDaemon.py Thu Aug 4 15:02:09 2005 +++ b/tools/python/xen/xend/server/SrvDaemon.py Thu Aug 4 11:00:18 2005 @@ -126,12 +126,8 @@ def cleanup_xend(self, kill=False): return self.cleanup_process(XEND_PID_FILE, "xend", kill) - def cleanup_xenstored(self, kill=False): - return self.cleanup_process(XENSTORED_PID_FILE, "xenstored", kill) - def cleanup(self, kill=False): self.cleanup_xend(kill=kill) - #self.cleanup_xenstored(kill=kill) def status(self): """Returns the status of the xend daemon. @@ -167,31 +163,6 @@ pidfile.write(str(pid)) pidfile.close() return pid - - def start_xenstored(self): - """Fork and exec xenstored, writing its pid to XENSTORED_PID_FILE. - """ - def mkdirs(p): - try: - os.makedirs(p) - except: - pass - mkdirs(XENSTORED_RUN_DIR) - mkdirs(XENSTORED_LIB_DIR) - - pid = self.fork_pid(XENSTORED_PID_FILE) - if pid: - # Parent - log.info("Started xenstored, pid=%d", pid) - else: - # Child - if XEND_DAEMONIZE: - self.daemonize() - if XENSTORED_DEBUG: - os.execl("/usr/sbin/xenstored", "xenstored", "--no-fork", - "-T", "/var/log/xenstored-trace.log") - else: - os.execl("/usr/sbin/xenstored", "xenstored", "--no-fork") def daemonize(self): if not XEND_DAEMONIZE: return @@ -223,14 +194,10 @@ 4 Insufficient privileges """ xend_pid = self.cleanup_xend() - xenstored_pid = self.cleanup_xenstored() if self.set_user(): return 4 os.chdir("/") - - if xenstored_pid == 0: - self.start_xenstored() if xend_pid > 0: # Trying to run an already-running service is a success. --------------000709090503020208000202 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------000709090503020208000202--