bitbake: cache/siggen: Add unihash cache copy function

We see rare failures in eSDK generation with zero sized unihash cache files. This is
almost certainly due to races in the cache file being updated. Add a copy function
where the cache file can be copied with the lock held to avoid this.

(Bitbake rev: 9e72a3915e36cb843037040cb68a82077436dbef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-06-01 19:14:41 +01:00
parent 3664efc86a
commit bcf935cd1b
2 changed files with 15 additions and 0 deletions

View File

@@ -24,6 +24,7 @@ from collections.abc import Mapping
import bb.utils
from bb import PrefixLoggerAdapter
import re
import shutil
logger = logging.getLogger("BitBake.Cache")
@@ -998,3 +999,11 @@ class SimpleCache(object):
p.dump([data, self.cacheversion])
bb.utils.unlockfile(glf)
def copyfile(self, target):
if not self.cachefile:
return
glf = bb.utils.lockfile(self.cachefile + ".lock")
shutil.copy(self.cachefile, target)
bb.utils.unlockfile(glf)

View File

@@ -120,6 +120,9 @@ class SignatureGenerator(object):
def save_unitaskhashes(self):
return
def copy_unitaskhashes(self, targetdir):
return
def set_setscene_tasks(self, setscene_tasks):
return
@@ -358,6 +361,9 @@ class SignatureGeneratorBasic(SignatureGenerator):
def save_unitaskhashes(self):
self.unihash_cache.save(self.unitaskhashes)
def copy_unitaskhashes(self, targetdir):
self.unihash_cache.copyfile(targetdir)
def dump_sigtask(self, fn, task, stampbase, runtime):
tid = fn + ":" + task