summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-02 17:20:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-02 22:41:00 (GMT)
commitab4cc02bf87c1b78933c221a29f187d05427ed08 (patch)
tree322a7d4437dbae4916267a868a1a7fd2d6111fa6
parent01c1167336e5e75077ceb46b6cc43981e09317f6 (diff)
downloadpoky-ab4cc02bf87c1b78933c221a29f187d05427ed08.tar.gz
bitbake: prserv/serv: Improve exit handling
Currently, I'm not sure how the prserver managed to shut down cleanly. These issues may explain some of the hangs people have reported. This change: * Ensures the connection acceptance thread monitors self.quit * We wait for the thread to exit before exitting * We sync the database when the thread exits * We do what the comment mentions, timeout after 30s and sync the database if needed. Previously, there was no timeout (the 0.5 applies to sockets, not the Queue object) (Bitbake rev: bd9d827ae6ef02ec9a0577fb2fd19b830ccb4416) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0926492295d485813d8a4f6b77c7b152e4c5b4c4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/prserv/serv.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
index 25eb46a..a7639c8 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -77,12 +77,15 @@ class PRServer(SimpleXMLRPCServer):
77 77
78 """ 78 """
79 iter_count = 1 79 iter_count = 1
80 # With 60 iterations between syncs and a 0.5 second timeout between 80 # 60 iterations between syncs or sync if dirty every ~30 seconds
81 # iterations, this will sync if dirty every ~30 seconds.
82 iterations_between_sync = 60 81 iterations_between_sync = 60
83 82
84 while True: 83 while not self.quit:
85 (request, client_address) = self.requestqueue.get() 84 try:
85 (request, client_address) = self.requestqueue.get(True, 30)
86 except Queue.Empty:
87 self.table.sync_if_dirty()
88 continue
86 try: 89 try:
87 self.finish_request(request, client_address) 90 self.finish_request(request, client_address)
88 self.shutdown_request(request) 91 self.shutdown_request(request)
@@ -93,6 +96,7 @@ class PRServer(SimpleXMLRPCServer):
93 self.handle_error(request, client_address) 96 self.handle_error(request, client_address)
94 self.shutdown_request(request) 97 self.shutdown_request(request)
95 self.table.sync() 98 self.table.sync()
99 self.table.sync_if_dirty()
96 100
97 def process_request(self, request, client_address): 101 def process_request(self, request, client_address):
98 self.requestqueue.put((request, client_address)) 102 self.requestqueue.put((request, client_address))
@@ -137,7 +141,7 @@ class PRServer(SimpleXMLRPCServer):
137 self.handlerthread.start() 141 self.handlerthread.start()
138 while not self.quit: 142 while not self.quit:
139 self.handle_request() 143 self.handle_request()
140 144 self.handlerthread.join()
141 self.table.sync() 145 self.table.sync()
142 logger.info("PRServer: stopping...") 146 logger.info("PRServer: stopping...")
143 self.server_close() 147 self.server_close()