diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-21 13:53:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:31:58 +0000 |
| commit | 8da8a0e55e7191b81e6e0fd1d2d4f0937ba7b0ac (patch) | |
| tree | fe93515c98838fc47abb94715f17607f85f3102e /bitbake/lib/prserv | |
| parent | 6abcc6118d068266947d6fd5acf78f744ec02cb6 (diff) | |
| download | ast2050-yocto-poky-8da8a0e55e7191b81e6e0fd1d2d4f0937ba7b0ac.zip ast2050-yocto-poky-8da8a0e55e7191b81e6e0fd1d2d4f0937ba7b0ac.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: 0926492295d485813d8a4f6b77c7b152e4c5b4c4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/prserv')
| -rw-r--r-- | bitbake/lib/prserv/serv.py | 14 |
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): """ iter_count = 1 - # With 60 iterations between syncs and a 0.5 second timeout between - # iterations, this will sync if dirty every ~30 seconds. + # 60 iterations between syncs or sync if dirty every ~30 seconds iterations_between_sync = 60 - while True: - (request, client_address) = self.requestqueue.get() + while not self.quit: + try: + (request, client_address) = self.requestqueue.get(True, 30) + except Queue.Empty: + self.table.sync_if_dirty() + continue try: self.finish_request(request, client_address) self.shutdown_request(request) @@ -93,6 +96,7 @@ class PRServer(SimpleXMLRPCServer): self.handle_error(request, client_address) self.shutdown_request(request) self.table.sync() + self.table.sync_if_dirty() def process_request(self, request, client_address): self.requestqueue.put((request, client_address)) @@ -137,7 +141,7 @@ class PRServer(SimpleXMLRPCServer): self.handlerthread.start() while not self.quit: self.handle_request() - + self.handlerthread.join() self.table.sync() logger.info("PRServer: stopping...") self.server_close() |
