summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/prserv
diff options
context:
space:
mode:
authorKonrad Scherer <Konrad.Scherer@windriver.com>2013-11-15 15:51:47 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-18 17:19:11 +0000
commite15893adf9268b2920b24c52d5c2bb777c6f778e (patch)
treee5d05fff678bc62b1d52ce72428f5a98099beffb /bitbake/lib/prserv
parent2354250a95eab484459f41f8715ae112295c2174 (diff)
downloadpoky-e15893adf9268b2920b24c52d5c2bb777c6f778e.tar.gz
poky-e15893adf9268b2920b24c52d5c2bb777c6f778e.tar.bz2
poky-e15893adf9268b2920b24c52d5c2bb777c6f778e.zip
bitbake: serv.py: Give pr-server up to 5 seconds to commit data
The default value of 0.5 seconds before sending the pr-server a SIGTERM is not enough to guarantee that sqlite has committed all the pr data to the database. By polling the pid to see if it is still running, this allows the pr-server process to shutdown cleanly and finish the final pr data commit. (Bitbake rev: 22eec978e70794923c85689928c6be0cfe71cdcd) Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/prserv')
-rw-r--r--bitbake/lib/prserv/serv.py23
1 files changed, 21 insertions, 2 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
index 7864594bb6..e4c1c2a6aa 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -13,6 +13,7 @@ except ImportError:
import bb.server.xmlrpc
import prserv
import prserv.db
+import errno
logger = logging.getLogger("BitBake.PRserv")
@@ -280,8 +281,18 @@ def stop_daemon(host, port):
if pid:
if os.path.exists(pidfile):
os.remove(pidfile)
- os.kill(pid,signal.SIGTERM)
- time.sleep(0.1)
+
+ wait_timeout = 0
+ while is_running(pid) and wait_timeout < 10:
+ print("Waiting for pr-server to exit.")
+ time.sleep(0.5)
+ wait_timeout += 1
+
+ if is_running(pid):
+ print("Sending SIGTERM to pr-server.")
+ os.kill(pid,signal.SIGTERM)
+ time.sleep(0.1)
+
except OSError as e:
err = str(e)
if err.find("No such process") <= 0:
@@ -289,6 +300,14 @@ def stop_daemon(host, port):
return 0
+def is_running(pid):
+ try:
+ os.kill(pid, 0)
+ except OSError as err:
+ if err.errno == errno.ESRCH:
+ return False
+ return True
+
def is_local_special(host, port):
if host.strip().upper() == 'localhost'.upper() and (not port):
return True