diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-09-26 14:23:53 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-27 13:02:06 +0100 |
commit | 7c829675581818f92d57056b57fbd3880829b6bd (patch) | |
tree | 1feba8885b8ad163b44c58d85a84ad28bf509202 | |
parent | 9fb862685e5e5a2aa534bc25cab1e4158d708b40 (diff) | |
download | bitbake-7c829675581818f92d57056b57fbd3880829b6bd.tar.gz |
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]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/cooker.py | 1 | ||||
-rw-r--r-- | lib/hashserv/tests.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 0c540028a..20ef04d3f 100644 --- a/lib/bb/cooker.py +++ b/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/lib/hashserv/tests.py b/lib/hashserv/tests.py index 6584ff57b..a5472a996 100644 --- a/lib/hashserv/tests.py +++ b/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) |