From 077ab926e388d477a788e3cf306e2b7443c3927e Mon Sep 17 00:00:00 2001 From: albailey Date: Fri, 14 May 2021 13:48:23 -0500 Subject: [PATCH] Updating some of the dcmanager and audit logs On startup of any process, the entire configuration was being logged, which was we were logging the entire configuration to the file (almost 200 lines per process). - Lowering that log to DEBUG. - Added an extra 'Starting...' log entry to help indicate when a process start/restart occurs. The update_subcloud_endpoint_status log was not including enough information, as it is called several times in a row for each endpoint. Two audit logs that are created every 30 seconds have been reduced from info to debug. Closes-Bug: 1928335 Change-Id: I7ada5abf87c2f28f5826c02345f8dd3197eae665 Signed-off-by: albailey --- distributedcloud/dcdbsync/cmd/api.py | 5 +++-- .../dcmanager/audit/patch_audit.py | 3 +-- .../dcmanager/audit/subcloud_audit_manager.py | 20 ++++++++++--------- distributedcloud/dcmanager/cmd/api.py | 5 +++-- distributedcloud/dcmanager/cmd/audit.py | 5 +++-- .../dcmanager/cmd/audit_worker.py | 5 +++-- distributedcloud/dcmanager/cmd/manager.py | 5 +++-- .../dcmanager/cmd/orchestrator.py | 5 +++-- distributedcloud/dcmanager/manager/service.py | 5 +++-- distributedcloud/dcorch/cmd/api.py | 5 +++-- distributedcloud/dcorch/cmd/api_proxy.py | 5 +++-- 11 files changed, 39 insertions(+), 29 deletions(-) diff --git a/distributedcloud/dcdbsync/cmd/api.py b/distributedcloud/dcdbsync/cmd/api.py index 251610a34..b01738f95 100644 --- a/distributedcloud/dcdbsync/cmd/api.py +++ b/distributedcloud/dcdbsync/cmd/api.py @@ -66,8 +66,9 @@ def main(): app.serve(service, CONF, workers) - LOG.info("Configuration:") - CONF.log_opt_values(LOG, std_logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + CONF.log_opt_values(LOG, std_logging.DEBUG) app.wait() diff --git a/distributedcloud/dcmanager/audit/patch_audit.py b/distributedcloud/dcmanager/audit/patch_audit.py index 615d0f150..b572e4e1c 100644 --- a/distributedcloud/dcmanager/audit/patch_audit.py +++ b/distributedcloud/dcmanager/audit/patch_audit.py @@ -31,7 +31,6 @@ from dccommon.drivers.openstack.sysinv_v1 import SysinvClient from dcorch.common import consts as dcorch_consts from dcmanager.common import consts -from dcmanager.common.i18n import _ from dcmanager.common import utils LOG = logging.getLogger(__name__) @@ -65,7 +64,7 @@ class PatchAudit(object): """Manages tasks related to patch audits.""" def __init__(self, context, dcmanager_rpc_client): - LOG.info(_('PatchAudit initialization...')) + LOG.debug('PatchAudit initialization...') self.context = context self.dcmanager_rpc_client = dcmanager_rpc_client self.audit_count = 0 diff --git a/distributedcloud/dcmanager/audit/subcloud_audit_manager.py b/distributedcloud/dcmanager/audit/subcloud_audit_manager.py index ad3e8f9ac..c32fe1deb 100644 --- a/distributedcloud/dcmanager/audit/subcloud_audit_manager.py +++ b/distributedcloud/dcmanager/audit/subcloud_audit_manager.py @@ -267,7 +267,7 @@ class SubcloudAuditManager(manager.Manager): """Audit availability of subclouds loop.""" # We will be running in our own green thread here. - LOG.info('Triggered subcloud audit.') + LOG.debug('Triggered subcloud audit.') self.audit_count += 1 # Determine whether to trigger a state update to each subcloud. @@ -336,27 +336,29 @@ class SubcloudAuditManager(manager.Manager): # It might make sense to split it out. if audit.patch_audit_requested or audit.load_audit_requested: audit_patch = True - LOG.info("DB says patch audit needed") + LOG.debug("DB says patch audit needed") break if not audit_firmware: for audit in subcloud_audits: if audit.firmware_audit_requested: - LOG.info("DB says firmware audit needed") + LOG.debug("DB says firmware audit needed") audit_firmware = True break if not audit_kubernetes: for audit in subcloud_audits: if audit.kubernetes_audit_requested: - LOG.info("DB says kubernetes audit needed") + LOG.debug("DB says kubernetes audit needed") audit_kubernetes = True break + LOG.info("Triggered subcloud audit: patch=(%s) firmware=(%s) kube=(%s)" + % (audit_patch, audit_firmware, audit_kubernetes)) patch_audit_data, firmware_audit_data, kubernetes_audit_data = \ self._get_audit_data(audit_patch, audit_firmware, audit_kubernetes) - LOG.info("patch_audit_data: %s, " - "firmware_audit_data: %s, " - "kubernetes_audit_data: %s, " % (patch_audit_data, - firmware_audit_data, - kubernetes_audit_data)) + LOG.debug("patch_audit_data: %s, " + "firmware_audit_data: %s, " + "kubernetes_audit_data: %s, " % (patch_audit_data, + firmware_audit_data, + kubernetes_audit_data)) # We want a chunksize of at least 1 so add the number of workers. chunksize = (len(subcloud_audits) + CONF.audit_worker_workers) / CONF.audit_worker_workers diff --git a/distributedcloud/dcmanager/cmd/api.py b/distributedcloud/dcmanager/cmd/api.py index d62912fa3..9b953ee13 100644 --- a/distributedcloud/dcmanager/cmd/api.py +++ b/distributedcloud/dcmanager/cmd/api.py @@ -69,8 +69,9 @@ def main(): app.serve(service, CONF, workers) - LOG.info("Configuration:") - CONF.log_opt_values(LOG, std_logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + CONF.log_opt_values(LOG, std_logging.DEBUG) app.wait() diff --git a/distributedcloud/dcmanager/cmd/audit.py b/distributedcloud/dcmanager/cmd/audit.py index e93e589bb..8a516a28c 100644 --- a/distributedcloud/dcmanager/cmd/audit.py +++ b/distributedcloud/dcmanager/cmd/audit.py @@ -54,8 +54,9 @@ def main(): launcher = service.launch(cfg.CONF, srv, workers=CONF.audit_workers) - LOG.info("Configuration:") - cfg.CONF.log_opt_values(LOG, logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + cfg.CONF.log_opt_values(LOG, logging.DEBUG) launcher.wait() diff --git a/distributedcloud/dcmanager/cmd/audit_worker.py b/distributedcloud/dcmanager/cmd/audit_worker.py index 55961cc15..fb58dccbd 100644 --- a/distributedcloud/dcmanager/cmd/audit_worker.py +++ b/distributedcloud/dcmanager/cmd/audit_worker.py @@ -54,8 +54,9 @@ def main(): launcher = service.launch(cfg.CONF, srv, workers=CONF.audit_worker_workers) - LOG.info("Configuration:") - cfg.CONF.log_opt_values(LOG, logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + cfg.CONF.log_opt_values(LOG, logging.DEBUG) launcher.wait() diff --git a/distributedcloud/dcmanager/cmd/manager.py b/distributedcloud/dcmanager/cmd/manager.py index 6f9cf10d1..7d9c6db43 100644 --- a/distributedcloud/dcmanager/cmd/manager.py +++ b/distributedcloud/dcmanager/cmd/manager.py @@ -57,8 +57,9 @@ def main(): launcher = service.launch(cfg.CONF, srv, workers=cfg.CONF.workers) - LOG.info("Configuration:") - cfg.CONF.log_opt_values(LOG, logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + cfg.CONF.log_opt_values(LOG, logging.DEBUG) # the following periodic tasks are intended serve as HA checking # srv.create_periodic_tasks() diff --git a/distributedcloud/dcmanager/cmd/orchestrator.py b/distributedcloud/dcmanager/cmd/orchestrator.py index d03b0362f..4f6805a6c 100644 --- a/distributedcloud/dcmanager/cmd/orchestrator.py +++ b/distributedcloud/dcmanager/cmd/orchestrator.py @@ -53,8 +53,9 @@ def main(): launcher = service.launch(CONF, srv, workers=cfg.CONF.orch_workers) - LOG.info("Configuration:") - CONF.log_opt_values(LOG, logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + CONF.log_opt_values(LOG, logging.DEBUG) launcher.wait() diff --git a/distributedcloud/dcmanager/manager/service.py b/distributedcloud/dcmanager/manager/service.py index 40a211962..59546a771 100644 --- a/distributedcloud/dcmanager/manager/service.py +++ b/distributedcloud/dcmanager/manager/service.py @@ -163,8 +163,9 @@ class DCManagerService(service.Service): SYNC_STATUS_OUT_OF_SYNC, alarmable=True): # Updates subcloud endpoint sync status - LOG.info("Handling update_subcloud_endpoint_status request for: %s" % - subcloud_name) + LOG.info("Handling update_subcloud_endpoint_status request for " + "subcloud: (%s) endpoint: (%s) status:(%s) " + % (subcloud_name, endpoint_type, sync_status)) self.subcloud_manager. \ update_subcloud_endpoint_status(context, diff --git a/distributedcloud/dcorch/cmd/api.py b/distributedcloud/dcorch/cmd/api.py index 3fd66ce3e..c44cd9f19 100644 --- a/distributedcloud/dcorch/cmd/api.py +++ b/distributedcloud/dcorch/cmd/api.py @@ -61,8 +61,9 @@ def main(): app.serve(service, CONF, workers) - LOG.info("Configuration:") - CONF.log_opt_values(LOG, std_logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + CONF.log_opt_values(LOG, std_logging.DEBUG) app.wait() diff --git a/distributedcloud/dcorch/cmd/api_proxy.py b/distributedcloud/dcorch/cmd/api_proxy.py index beb6adac5..3075d194e 100644 --- a/distributedcloud/dcorch/cmd/api_proxy.py +++ b/distributedcloud/dcorch/cmd/api_proxy.py @@ -111,8 +111,9 @@ def main(): app.serve(service, CONF, workers) - LOG.info("Configuration:") - CONF.log_opt_values(LOG, std_logging.INFO) + LOG.info("Starting...") + LOG.debug("Configuration:") + CONF.log_opt_values(LOG, std_logging.DEBUG) app.wait()