From 6448634205ac1c62fc2ed163498cf65f0f21ca6b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Mar 2014 12:10:54 +0000 Subject: bitbake: prserv: Fix exit race issues We shouldn't immediately remove the pid file when stopping the server, if we do, this causes a traceback within the server itself which can then hang. Fix this by removing the stale pid file as the last thing we do. Also: * don't printing a new "waiting" line every 0.5 seconds. * make the loop more granular since the user can 'feel' the 0.5 seconds [YOCTO #5984] (Bitbake rev: 81f41a806aeddcc38992163557672e296bcbc967) Signed-off-by: Richard Purdie --- bitbake/lib/prserv/serv.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index e4c1c2a6aa..1e170cea0a 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -275,17 +275,13 @@ def stop_daemon(host, port): PRServerConnection(host, port).terminate() except: logger.critical("Stop PRService %s:%d failed" % (host,port)) - time.sleep(0.5) try: if pid: - if os.path.exists(pidfile): - os.remove(pidfile) - wait_timeout = 0 - while is_running(pid) and wait_timeout < 10: - print("Waiting for pr-server to exit.") - time.sleep(0.5) + print("Waiting for pr-server to exit.") + while is_running(pid) and wait_timeout < 50: + time.sleep(0.1) wait_timeout += 1 if is_running(pid): @@ -293,6 +289,9 @@ def stop_daemon(host, port): os.kill(pid,signal.SIGTERM) time.sleep(0.1) + if os.path.exists(pidfile): + os.remove(pidfile) + except OSError as e: err = str(e) if err.find("No such process") <= 0: -- cgit v1.2.3-54-g00ecf