[oe-commits] [bitbake] 03/03: cooker: clear extra config settings and remote datastores on client disconnect
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 5 14:02:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository bitbake.
commit 1ca2eec459424892391f060442ef38cf28d6a54a
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Sep 4 14:00:31 2017 +1200
cooker: clear extra config settings and remote datastores on client disconnect
When the UI disconnects, we can throw away any server-side remote
datastores we created in response to calls from the UI, and we *must*
drop everything in extraconfigdata or it will taint any future
operations.
Dropping extraconfigdata upon disconnect fixes taskhash mismatch errors
when running devtool.DevtoolTests.test_devtool_update_recipe_local_files
within oe-selftest with BB_SERVER_TIMEOUT=100 in OpenEmbedded.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/command.py | 3 +++
lib/bb/cooker.py | 2 ++
2 files changed, 5 insertions(+)
diff --git a/lib/bb/command.py b/lib/bb/command.py
index 0d0354c..6c966e3 100644
--- a/lib/bb/command.py
+++ b/lib/bb/command.py
@@ -145,6 +145,9 @@ class Command:
self.currentAsyncCommand = None
self.cooker.finishcommand()
+ def reset(self):
+ self.remotedatastores = bb.remotedata.RemoteDatastores(self.cooker)
+
def split_mc_pn(pn):
if pn.startswith("multiconfig:"):
_, mc, pn = pn.split(":", 2)
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 90de40d..7d040dc 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1616,6 +1616,8 @@ class BBCooker:
def clientComplete(self):
"""Called when the client is done using the server"""
self.finishcommand()
+ self.extraconfigdata = {}
+ self.command.reset()
self.databuilder.reset()
self.data = self.databuilder.data
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list