starlingx
/
distcloud
Code Issues Proposed changes

Merge "Reduce dcorch log size"

This commit is contained in:
Zuul 2020-03-12 15:41:02 +00:00 committed by Gerrit Code Review
parent c1dc50045a 3c8d6bc7f5
commit 99899f78d3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distributedcloud/dcorch/engine/sync_services/sysinv.py
View File

@ -611,13 +611,13 @@ class SysinvSyncThread(SyncThread):
return resource.ip_address
elif resource_type == consts.RESOURCE_TYPE_SYSINV_CERTIFICATE:
if hasattr(resource, 'signature'):
LOG.info("get_resource_id signature={}".format(
LOG.debug("get_resource_id signature={}".format(
resource.signature))
if resource.signature is None:
return self.CERTIFICATE_SIG_NULL
return resource.signature
elif hasattr(resource, 'master_id'):
LOG.info("get_resource_id master_id signature={}".format(
LOG.debug("get_resource_id master_id signature={}".format(
resource.master_id))
if resource.master_id is None:
# master_id cannot be None
@ -627,16 +627,16 @@ class SysinvSyncThread(SyncThread):
LOG.error("no get_resource_id for certificate")
return self.CERTIFICATE_SIG_NULL
elif resource_type == consts.RESOURCE_TYPE_SYSINV_FERNET_REPO:
LOG.info("get_resource_id {} resource={}".format(
LOG.debug("get_resource_id {} resource={}".format(
resource_type, resource))
return FERNET_REPO_MASTER_ID
else:
if hasattr(resource, 'uuid'):
LOG.info("get_resource_id {} uuid={}".format(
LOG.debug("get_resource_id {} uuid={}".format(
resource_type, resource.uuid))
return resource.uuid
else:
LOG.info("get_resource_id NO uuid resource_type={}".format(
LOG.debug("get_resource_id NO uuid resource_type={}".format(
resource_type))
return self.RESOURCE_UUID_NULL # master_id cannot be None
@ -696,8 +696,8 @@ class SysinvSyncThread(SyncThread):
return same_user
def same_fernet_key(self, i1, i2):
LOG.info("same_fernet_repo i1={}, i2={}".format(i1, i2),
extra=self.log_extra)
LOG.debug("same_fernet_repo i1={}, i2={}".format(i1, i2),
extra=self.log_extra)
same_fernet = True
if (FernetKeyManager.get_resource_hash(i1) !=
FernetKeyManager.get_resource_hash(i2)):

10
distributedcloud/dcorch/engine/sync_thread.py
View File

@ -456,8 +456,8 @@ class SyncThread(object):
if sc_resources is None or m_resources is None:
return
LOG.info("Audit {}: {} vs {}".format(
resource_type, m_resources, sc_resources),
LOG.info("Audit {}".format(
resource_type),
extra=self.log_extra)
LOG.debug("Auditing {}: master={} db={} sc={}".format(
resource_type, m_resources, db_resources, sc_resources),
@ -550,9 +550,9 @@ class SyncThread(object):
if sc_id == db_sc_resource.subcloud_resource_id:
if self.same_resource(resource_type,
m_r_updated, sc_r):
LOG.info("Resource type {} {} is in-sync"
.format(resource_type, master_id),
extra=self.log_extra)
LOG.debug("Resource type {} {} is in-sync"
.format(resource_type, master_id),
extra=self.log_extra)
num_of_audit_jobs += self.audit_dependants(
resource_type, m_r, sc_r)
sc_rsrc_present = True