From d6abc07ff385357d312d8435b89e0a9c1f965433 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Mon, 25 Nov 2013 15:21:27 -0600 Subject: bitbake, xmlrpc.py: Implement memory resident auto port configuration/restart This patch adds the ability to dynamically select a port for the bitbake memory resident server when the BBSERVER port is set to -1. This allows for running multiple instances of the bitbake memory resident server on the same system in different build directories. The client portion of the bitbake instance can also request that the server automatically start when using the auto port feature. This is to deal with a bitbake instance that eventually times out and exits or that has died for some unknown reason. The new functionality allows for lazy startup of the server after sourcing the init script for the memory resident functionality. Signed-off-by: Jason Wessel Signed-off-by: Richard Purdie --- bin/bitbake | 10 ++++++++++ lib/bb/server/xmlrpc.py | 33 +++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/bin/bitbake b/bin/bitbake index cca2b8d29..a0a2baa4b 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -302,6 +302,7 @@ def main(): # we start a stub server that is actually a XMLRPClient that connects to a real server server = servermodule.BitBakeXMLRPCClient(configParams.observe_only) server.saveConnectionDetails(configParams.remote_server) + server.saveConnectionConfigParams(configParams) if not configParams.server_only: # Collect the feature set for the UI @@ -312,11 +313,20 @@ def main(): server_connection = server.establishConnection(featureset) except: sys.exit(1) + if not server_connection: + sys.exit(1) server_connection.terminate() sys.exit(0) # Setup a connection to the server (cooker) server_connection = server.establishConnection(featureset) + if not server_connection: + if configParams.kill_server: + bb.fatal("Server already killed") + configParams.bind = configParams.remote_server + start_server(servermodule, configParams, configuration) + bb.event.ui_queue = [] + server_connection = server.establishConnection(featureset) # Restore the environment in case the UI needs it for k in cleanedvars: diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index 82c0e8d8a..3a67ab0cf 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -338,13 +338,38 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): def saveConnectionDetails(self, remote): self.remote = remote + def saveConnectionConfigParams(self, configParams): + self.configParams = configParams + def establishConnection(self, featureset): # The format of "remote" must be "server:port" try: [host, port] = self.remote.split(":") port = int(port) - except: - return None + except Exception as e: + bb.fatal("Failed to read remote definition (%s)" % str(e)) + + # use automatic port if port set to -1, meaning read it from + # the bitbake.lock file + if port == -1: + lock_location = "%s/bitbake.lock" % self.configParams.environment.get('BUILDDIR') + lock = bb.utils.lockfile(lock_location, False, False) + if lock: + # This means there is no server running which we can + # connect to on the local system. + bb.utils.unlockfile(lock) + return None + + try: + lf = open(lock_location, 'r') + remotedef = lf.readline() + [host, port] = remotedef.split(":") + port = int(port) + lf.close() + self.remote = remotedef + except Exception as e: + bb.fatal("Failed to read bitbake.lock (%s)" % str(e)) + # We need our IP for the server connection. We get the IP # by trying to connect with the server try: @@ -352,8 +377,8 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): s.connect((host, port)) ip = s.getsockname()[0] s.close() - except: - return None + except Exception as e: + bb.fatal("Could not create socket for %s:%s (%s)" % (host, port, str(e))) try: self.serverImpl = XMLRPCProxyServer(host, port) self.connection = BitBakeXMLRPCServerConnection(self.serverImpl, (ip, 0), self.observer_only, featureset) -- cgit 1.2.3-korg