From 88fcf8422dd04372d73aacfef0ee50de09ef41bd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Mar 2022 23:23:28 +0000 Subject: bitbake: cooker/siggen: Support exit calls and use for hashserv client We have shutdown functions within the async client code but the siggen doesn't currently call them. We notice on python 3.10 (such as on fedora35) that at exit, there is a stray asyncio process left behind. Usually this doesn't cause problems but it could potentially be a cause of a hang. For general cleanliness and completness, add in hooks to call the exit handler. (Bitbake rev: 9ee3fb95330003878fbd64b3ce8897aad96fcd0f) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 1 + bitbake/lib/bb/siggen.py | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f79dc2770d..c0a7a2fd79 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1717,6 +1717,7 @@ class BBCooker: def post_serve(self): self.shutdown(force=True) prserv.serv.auto_shutdown() + bb.parse.siggen.exit() if self.hashserv: self.hashserv.process.terminate() self.hashserv.process.join() diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 96e16a45f8..ff6b24ccda 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -156,6 +156,9 @@ class SignatureGenerator(object): return DataCacheProxy() + def exit(self): + return + class SignatureGeneratorBasic(SignatureGenerator): """ """ @@ -489,6 +492,12 @@ class SignatureGeneratorUniHashMixIn(object): self._client = hashserv.create_client(self.server) return self._client + def exit(self): + if getattr(self, '_client', None) is not None: + self._client.close() + self._client = None + return super().exit() + def get_stampfile_hash(self, tid): if tid in self.taskhash: # If a unique hash is reported, use it as the stampfile hash. This -- cgit v1.2.3-54-g00ecf