From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mail.openembedded.org (Postfix) with ESMTP id 3D813731D2 for ; Tue, 5 Jan 2016 15:42:27 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 05 Jan 2016 07:42:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,525,1444719600"; d="scan'208";a="884211750" Received: from linux.intel.com ([10.23.219.25]) by orsmga002.jf.intel.com with ESMTP; 05 Jan 2016 07:42:27 -0800 Received: from vmed.fi.intel.com (vmed.fi.intel.com [10.237.72.51]) by linux.intel.com (Postfix) with ESMTP id ED5C26A4004; Tue, 5 Jan 2016 08:30:24 -0800 (PST) From: Ed Bartosh To: bitbake-devel@lists.openembedded.org Date: Tue, 5 Jan 2016 15:45:38 +0200 Message-Id: <1452001538-25251-3-git-send-email-ed.bartosh@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452001538-25251-1-git-send-email-ed.bartosh@linux.intel.com> References: <1452001538-25251-1-git-send-email-ed.bartosh@linux.intel.com> Subject: [PATCH v2 2/2] bitbake: main: kill server without queue setup X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 15:42:28 -0000 Setup of event queue includes registering of UI handler. This operation can fail when cooker is busy. However, there is no need in registering UI handler for terminating the server. Moved the call of connection.terminateServer before setting up of the event queue. This should make terminating server to work more reliably as it doesn't depend on setting up the event queue and registering UI handler anymore. This should also help Toaster backend to restart bitbake server and observer without getting "Could not register UI event handler" errors. [YOCTO #8776] Signed-off-by: Ed Bartosh diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index dd04393..c0ae38a 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -403,10 +403,16 @@ def bitbake_main(configParams, configuration): if not configParams.server_only: try: server_connection = server.establishConnection(featureset) - server_connection.setupEventQueue() except Exception as e: bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) + if configParams.kill_server: + server_connection.connection.terminateServer() + bb.event.ui_queue = [] + return 0 + + server_connection.setupEventQueue() + # Restore the environment in case the UI needs it for k in cleanedvars: os.environ[k] = cleanedvars[k] @@ -418,11 +424,6 @@ def bitbake_main(configParams, configuration): server_connection.terminate() return 0 - if configParams.kill_server: - server_connection.connection.terminateServer() - bb.event.ui_queue = [] - return 0 - try: return ui_module.main(server_connection.connection, server_connection.events, configParams) finally: -- 2.1.4