diff options
| -rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 29 | ||||
| -rw-r--r-- | meta/classes/sstate.bbclass | 9 |
2 files changed, 27 insertions, 11 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index eda99a0930e..d7eff405a16 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -136,21 +136,29 @@ class Wget(FetchMethod): return True def checkstatus(self, fetch, ud, d, try_again=True): + bb.warn("checkstatus: %s" % ud.url) + class HTTPConnectionCache(http.client.HTTPConnection): - if fetch.connection_cache: - def connect(self): + def connect(self): + if fetch.connection_cache: """Connect to the host and port specified in __init__.""" sock = fetch.connection_cache.get_connection(self.host, self.port) if sock: + bb.warn("%s reusing socket for %s" % (fetch.connection_cache, self.host)) self.sock = sock else: + bb.warn("%s creating new socket for %s" % (fetch.connection_cache, self.host)) self.sock = socket.create_connection((self.host, self.port), self.timeout, self.source_address) fetch.connection_cache.add_connection(self.host, self.port, self.sock) - if self._tunnel_host: - self._tunnel() + else: + bb.warn("%s creating fresh socket for %s" % (fetch.connection_cache, self.host)) + self.sock = socket.create_connection((self.host, self.port), self.timeout, self.source_address) + + if self._tunnel_host: + self._tunnel() class CacheHTTPHandler(urllib.request.HTTPHandler): def http_open(self, req): @@ -206,6 +214,8 @@ class Wget(FetchMethod): try: h.request(req.get_method(), req.selector, req.data, headers) except socket.error as err: # XXX what error? + import traceback + bb.warn("socket error: %s\n%s" % (err, "".join(traceback.format_tb(err.__traceback__)))) # Don't close connection when cache is enabled. # Instead, try to detect connections that are no longer # usable (for example, closed unexpectedly) and remove @@ -360,20 +370,23 @@ class Wget(FetchMethod): with opener.open(r) as response: pass except urllib.error.URLError as e: + import traceback + logger.warn("checkstatus urlopen(%s) failed: %s\n%s" % (ud.url, e, "".join(traceback.format_tb(e.__traceback__)))) if try_again: - logger.debug2("checkstatus: trying again") + logger.warn("checkstatus: trying again") return self.checkstatus(fetch, ud, d, False) else: # debug for now to avoid spamming the logs in e.g. remote sstate searches - logger.debug2("checkstatus() urlopen failed: %s" % e) + logger.warn("checkstatus() urlopen failed: %s" % e) return False except ConnectionResetError as e: + logger.warn("checkstatus urlopen(%s) connection reset: %s" % (ud.url, e)) if try_again: - logger.debug2("checkstatus: trying again") + logger.warn("checkstatus: trying again") return self.checkstatus(fetch, ud, d, False) else: # debug for now to avoid spamming the logs in e.g. remote sstate searches - logger.debug2("checkstatus() urlopen failed: %s" % e) + logger.warn("checkstatus() urlopen failed: %s" % e) return False return True diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index ae3317e3871..39f7e8395ae 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -962,9 +962,12 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, from bb.fetch2 import FetchConnectionCache def checkstatus_init(thread_worker): thread_worker.connection_cache = FetchConnectionCache() + bb.warn("checkstatus_init: created connection cache %s" % thread_worker.connection_cache) def checkstatus_end(thread_worker): + bb.warn("checkstatus_init: killing cache %s" % thread_worker.connection_cache) thread_worker.connection_cache.close_connections() + thread_worker.connection_cache = None def checkstatus(thread_worker, arg): (tid, sstatefile) = arg @@ -983,10 +986,10 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, foundNet.add(tid) if tid in missed: missed.remove(tid) - except: + except Exception as e: missed.add(tid) - bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri) - pass + bb.warn("SState: Unsuccessful fetch test for %s (%s)" % (srcuri, e)) + if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d) |