From f9b2821f7ffe2d0ec2b696667ea6ecd067086902 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Nov 2016 19:33:25 -0500 Subject: [PATCH] Some better logging around PDC stuff. I spent a while debugging these interactions tonight and the log statements definitely helped to figure it out. --- module_build_service/pdc.py | 4 ++++ module_build_service/scheduler/handlers/modules.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py index a3f41c05..aad575d7 100644 --- a/module_build_service/pdc.py +++ b/module_build_service/pdc.py @@ -108,6 +108,7 @@ def variant_dict_from_str(module_str): Example minimal module_info {'variant_id': module_name, 'variant_version': module_version, 'variant_type': 'module'} """ + log.debug("variant_dict_from_str(%r)" % module_str) # best match due several filters not being provided such as variant type ... module_info = {} @@ -163,6 +164,7 @@ def module_depsolving_wrapper(session, module_list, strict=True): :param module_list: list of module_info dicts :return final list of module_info which pass repoclosure """ + log.debug("module_depsolving_wrapper(%r, strict=%r)" % (module_list, strict)) # TODO: implement this # Make sure that these are dicts from PDC ... ensures all values @@ -197,6 +199,7 @@ def get_module_runtime_dependencies(session, module_info, strict=False): Example minimal module_info {'variant_id': module_name, 'variant_version': module_version, 'variant_type': 'module'} """ + log.debug("get_module_runtime_dependencies(%r, strict=%r)" % (module_info, strict)) # XXX get definitive list of modules deps = [] @@ -217,6 +220,7 @@ def get_module_build_dependencies(session, module_info, strict=False): Example minimal module_info {'variant_id': module_name, 'variant_version': module_version, 'variant_type': 'module'} """ + log.debug("get_module_build_dependencies(%r, strict=%r)" % (module_info, strict)) # XXX get definitive list of modules deps = [] diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 98f70c98..2875dd51 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -103,10 +103,10 @@ def wait(config, session, msg): @module_build_service.utils.retry(interval=10, timeout=30, wait_on=ValueError) def _get_deps_and_tag(): - log.info("Getting %s deps from pdc" % module_info['name']) + log.info("Getting %s deps from pdc (query %r)" % (module_info['name'], pdc_query)) dependencies = module_build_service.pdc.get_module_build_dependencies( pdc_session, pdc_query, strict=True) - log.info("Getting %s tag from pdc" % module_info['name']) + log.info("Getting %s tag from pdc (query %r)" % (module_info['name'], pdc_query)) tag = module_build_service.pdc.get_module_tag( pdc_session, pdc_query, strict=True) return dependencies, tag