From 2ac500a609e10b0f1aba698f756a0fc9d022240f Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 26 Sep 2019 14:23:53 -0500 Subject: bitbake: hashserv: Don't daemonize server process The hash server process is terminated and waited on with join(), so it should not be a daemon. Daemonizing it cause races with the server cleanup, especially in the selftest because the process may not have terminated and cleanup up its socket before the test cleanup runs and tries to do it. [YOCTO #13542] (Bitbake rev: 7c829675581818f92d57056b57fbd3880829b6bd) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 1 - bitbake/lib/hashserv/tests.py | 1 - 2 files changed, 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 0c540028ae..20ef04d3ff 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -399,7 +399,6 @@ class BBCooker: self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") self.hashserv = hashserv.create_server(self.hashservaddr, dbfile, sync=False) self.hashserv.process = multiprocessing.Process(target=self.hashserv.serve_forever) - self.hashserv.process.daemon = True self.hashserv.process.start() self.data.setVar("BB_HASHSERVE", self.hashservaddr) self.databuilder.origdata.setVar("BB_HASHSERVE", self.hashservaddr) diff --git a/bitbake/lib/hashserv/tests.py b/bitbake/lib/hashserv/tests.py index 6584ff57b4..a5472a996d 100644 --- a/bitbake/lib/hashserv/tests.py +++ b/bitbake/lib/hashserv/tests.py @@ -32,7 +32,6 @@ class TestHashEquivalenceServer(object): self.server = create_server(self.get_server_addr(), self.dbfile) self.server_thread = multiprocessing.Process(target=self._run_server) - self.server_thread.daemon = True self.server_thread.start() self.client = create_client(self.server.address) -- cgit v1.2.3-54-g00ecf