summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-03-09 11:33:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-13 11:29:23 +0000
commit622ec78f7e3a58e2e1402b046345f52b68effe21 (patch)
tree945aeef975a5a9eca87efa348a4d5e036e09da50 /bitbake/lib/bb
parent554894287ec8f3bd0612dddabee43213c12c3dc3 (diff)
downloadpoky-622ec78f7e3a58e2e1402b046345f52b68effe21.tar.gz
bitbake: runqueue/siggen: Lower hash equivalence logging
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/runqueue.py6
-rw-r--r--bitbake/lib/bb/siggen.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e84890b8b7..cef9b0fbbf 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2264,7 +2264,7 @@ class RunQueueExecute:
2264 self.updated_taskhash_queue.remove((tid, unihash)) 2264 self.updated_taskhash_queue.remove((tid, unihash))
2265 2265
2266 if unihash != self.rqdata.runtaskentries[tid].unihash: 2266 if unihash != self.rqdata.runtaskentries[tid].unihash:
2267 hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) 2267 hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash))
2268 self.rqdata.runtaskentries[tid].unihash = unihash 2268 self.rqdata.runtaskentries[tid].unihash = unihash
2269 bb.parse.siggen.set_unihash(tid, unihash) 2269 bb.parse.siggen.set_unihash(tid, unihash)
2270 toprocess.add(tid) 2270 toprocess.add(tid)
@@ -2309,7 +2309,7 @@ class RunQueueExecute:
2309 elif tid in self.scenequeue_covered or tid in self.sq_live: 2309 elif tid in self.scenequeue_covered or tid in self.sq_live:
2310 # Already ran this setscene task or it running. Report the new taskhash 2310 # Already ran this setscene task or it running. Report the new taskhash
2311 bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) 2311 bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
2312 hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) 2312 hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid))
2313 remapped = True 2313 remapped = True
2314 2314
2315 if not remapped: 2315 if not remapped:
@@ -2410,7 +2410,7 @@ class RunQueueExecute:
2410 2410
2411 for (tid, harddepfail, origvalid) in update_tasks: 2411 for (tid, harddepfail, origvalid) in update_tasks:
2412 if tid in self.sqdata.valid and not origvalid: 2412 if tid in self.sqdata.valid and not origvalid:
2413 hashequiv_logger.info("Setscene task %s became valid" % tid) 2413 hashequiv_logger.verbose("Setscene task %s became valid" % tid)
2414 if harddepfail: 2414 if harddepfail:
2415 self.sq_task_failoutright(tid) 2415 self.sq_task_failoutright(tid)
2416 2416
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 0357b544b5..8bfc45235d 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object):
607 method = method + self.extramethod[tid] 607 method = method + self.extramethod[tid]
608 608
609 data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) 609 data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data)
610 hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) 610 hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data)))
611 611
612 if data is None: 612 if data is None:
613 bb.warn("Server unable to handle unihash report") 613 bb.warn("Server unable to handle unihash report")
@@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object):
616 finalunihash = data['unihash'] 616 finalunihash = data['unihash']
617 617
618 if finalunihash == current_unihash: 618 if finalunihash == current_unihash:
619 hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) 619 hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash))
620 elif finalunihash == wanted_unihash: 620 elif finalunihash == wanted_unihash:
621 hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) 621 hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash))
622 self.set_unihash(tid, finalunihash) 622 self.set_unihash(tid, finalunihash)
623 return True 623 return True
624 else: 624 else:
625 # TODO: What to do here? 625 # TODO: What to do here?
626 hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) 626 hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash))
627 627
628 except hashserv.client.HashConnectionError as e: 628 except hashserv.client.HashConnectionError as e:
629 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) 629 bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e)))