[bitbake-devel] [PATCH] prserv/serv: Improve exit handling

[Martin Jansa]

On Wed, Sep 02, 2015 at 10:20:06AM -0700, Saul Wold wrote:
> From: Richard Purdie <richard.purdie at linuxfoundation.org>

The subject doesn't say for which branch this is intended.

I guess 1.24, because it's already in 1.26 and master, but it should be
specified in Subject.

> 
> 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)
> 
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> (cherry picked from commit 0926492295d485813d8a4f6b77c7b152e4c5b4c4)
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  lib/prserv/serv.py | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
> index 25eb46a..a7639c8 100644
> --- a/lib/prserv/serv.py
> +++ b/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()
> -- 
> 2.1.0
> 
> -- 
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/bitbake-devel/attachments/20150902/0f88ebb8/attachment-0002.sig>