From afa5a50d6ef0aaef8ffd2033f58195931d110142 Mon Sep 17 00:00:00 2001 From: Nolan Woods Date: Wed, 23 Mar 2022 16:32:56 -0700 Subject: [PATCH 1/3] Report resolution cache miss for galaxy.tool_util.deps.container_resolvers.mulled.util:namespace_repo_names This is important to detect if Galaxy is hammering quay.io for any reason. --- lib/galaxy/tool_util/deps/mulled/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/tool_util/deps/mulled/util.py b/lib/galaxy/tool_util/deps/mulled/util.py index 5f88b7946700..0b1ba4350d6a 100644 --- a/lib/galaxy/tool_util/deps/mulled/util.py +++ b/lib/galaxy/tool_util/deps/mulled/util.py @@ -79,6 +79,7 @@ def _namespace_has_repo_name(namespace, repo_name, resolution_cache): return repo_name in resolution_cache.get(cache_key) except KeyError: pass + log.debug("Resolution cache miss: " + cache_key) next_page = None repo_names = [] repos_headers = {"Accept-encoding": "gzip", "Accept": "application/json"} From 2fa64b33db75234e8c2809eb609dc4a68b577c92 Mon Sep 17 00:00:00 2001 From: Nolan Woods Date: Fri, 25 Mar 2022 11:51:49 -0700 Subject: [PATCH 2/3] Change log output to signify what is actually occurring --- lib/galaxy/tool_util/deps/mulled/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/deps/mulled/util.py b/lib/galaxy/tool_util/deps/mulled/util.py index 0b1ba4350d6a..d790520bc71b 100644 --- a/lib/galaxy/tool_util/deps/mulled/util.py +++ b/lib/galaxy/tool_util/deps/mulled/util.py @@ -79,7 +79,7 @@ def _namespace_has_repo_name(namespace, repo_name, resolution_cache): return repo_name in resolution_cache.get(cache_key) except KeyError: pass - log.debug("Resolution cache miss: " + cache_key) + log.debug("Querying " + QUAY_REPOSITORY_API_ENDPOINT + " for repos within " + namespace) next_page = None repo_names = [] repos_headers = {"Accept-encoding": "gzip", "Accept": "application/json"} From a15d27d6f9371e207676a399bc102db60fa41ae9 Mon Sep 17 00:00:00 2001 From: Nolan Woods Date: Wed, 25 May 2022 11:13:15 -0700 Subject: [PATCH 3/3] Switch to format string for debug output Co-authored-by: Marius van den Beek --- lib/galaxy/tool_util/deps/mulled/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/deps/mulled/util.py b/lib/galaxy/tool_util/deps/mulled/util.py index d790520bc71b..0b386cda937a 100644 --- a/lib/galaxy/tool_util/deps/mulled/util.py +++ b/lib/galaxy/tool_util/deps/mulled/util.py @@ -79,7 +79,7 @@ def _namespace_has_repo_name(namespace, repo_name, resolution_cache): return repo_name in resolution_cache.get(cache_key) except KeyError: pass - log.debug("Querying " + QUAY_REPOSITORY_API_ENDPOINT + " for repos within " + namespace) + log.debug(f"Querying {QUAY_REPOSITORY_API_ENDPOINT} for repos within {namespace}") next_page = None repo_names = [] repos_headers = {"Accept-encoding": "gzip", "Accept": "application/json"}