mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: runqueue/siggen: Lower hash equivalence logging

Browse Source 
Lowers the level at which hash equivalence messages are logged so as to
not annoy the majority of users. The autobuilder can use a custom
logging configuration to log these to a file for debugging (see
contrib/autobuilderlog.json)

[YOCTO #13813]

(Bitbake rev: 2ddb649ea31afe052f08e3969e36abf6fb515bc2)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2020-03-09 11:33:52 -05:00
committed by Richard Purdie
parent 554894287e
commit 622ec78f7e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/runqueue.py
+3 -3
View File
@@ -2264,7 +2264,7 @@ class RunQueueExecute:
self.updated_taskhash_queue.remove((tid, unihash)) self.updated_taskhash_queue.remove((tid, unihash))
if unihash != self.rqdata.runtaskentries[tid].unihash: if unihash != self.rqdata.runtaskentries[tid].unihash:
hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash))
self.rqdata.runtaskentries[tid].unihash = unihash self.rqdata.runtaskentries[tid].unihash = unihash
bb.parse.siggen.set_unihash(tid, unihash) bb.parse.siggen.set_unihash(tid, unihash)
toprocess.add(tid) toprocess.add(tid)
@@ -2309,7 +2309,7 @@ class RunQueueExecute:
elif tid in self.scenequeue_covered or tid in self.sq_live: elif tid in self.scenequeue_covered or tid in self.sq_live:
# Already ran this setscene task or it running. Report the new taskhash # Already ran this setscene task or it running. Report the new taskhash
bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid))
remapped = True remapped = True
if not remapped: if not remapped:
@@ -2410,7 +2410,7 @@ class RunQueueExecute:
for (tid, harddepfail, origvalid) in update_tasks: for (tid, harddepfail, origvalid) in update_tasks:
if tid in self.sqdata.valid and not origvalid: if tid in self.sqdata.valid and not origvalid:
hashequiv_logger.info("Setscene task %s became valid" % tid) hashequiv_logger.verbose("Setscene task %s became valid" % tid)
if harddepfail: if harddepfail:
self.sq_task_failoutright(tid) self.sq_task_failoutright(tid)
bitbake/lib/bb/siggen.py
+4 -4
View File
@@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object):
method = method + self.extramethod[tid] method = method + self.extramethod[tid]
data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data)
hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data)))
if data is None: if data is None:
bb.warn("Server unable to handle unihash report") bb.warn("Server unable to handle unihash report")
@@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object):
finalunihash = data['unihash'] finalunihash = data['unihash']
if finalunihash == current_unihash: if finalunihash == current_unihash:
hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash))
elif finalunihash == wanted_unihash: elif finalunihash == wanted_unihash:
hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash))
self.set_unihash(tid, finalunihash) self.set_unihash(tid, finalunihash)
return True return True
else: else:
# TODO: What to do here? # TODO: What to do here?
hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash))
except hashserv.client.HashConnectionError as e: except hashserv.client.HashConnectionError as e:
bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))