Merge "Increase log messages for pci-irq-affinity-agent"

utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/config.py

@@ -27,6 +27,9 @@ pci_irq_affinity_opts = [
     cfg.IntOpt('msi_irq_check_interval',
                default=2,
                help='Check interval in seconds for msi irqs to stabilize.'),
+    cfg.IntOpt('log_level',
+               default=20,
+               help='Set the log level for the agent.'),
     cfg.StrOpt('config_file',
                default='/etc/pci_irq_affinity/config.ini',
                help='Get config info from specific config file.'),

utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/log.py

@@ -14,6 +14,8 @@
 import logging
 import logging.handlers
 
+from pci_irq_affinity.config import CONF
+
 _syslog_facility = 'local1'
 
 
@@ -25,4 +27,4 @@ handler = logging.handlers.SysLogHandler(address='/dev/log',
                                          facility=_syslog_facility)
 handler.setFormatter(formatter)
 LOG.addHandler(handler)
-LOG.setLevel(logging.INFO)
+LOG.setLevel(CONF.log_level)

utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/utils.py

@@ -227,6 +227,7 @@ def set_irq_affinity(set_bitmap, irqs, cpulist):
         try:
             with open(irq_aff_path, 'w') as f:
                 f.write(cpulist)
+                LOG.info("PCI IRQ %s pinned to CPUS: %s" % (irq, cpulist))
             _irqs.update([irq])
         except Exception as e:
             LOG.warning("Failed to write pci affine file:%(F)s, irq:%(I)s, "
@@ -286,6 +287,7 @@ def set_irqs_affinity_by_pci_address(pci_addr, extra_spec=None,
         return (irqs, msi_irqs, numa_node, cpulist)
 
     # Set IRQ affinity, but do not treat errors as fatal.
+    LOG.debug("Setting affinity %s for irqs: %s and msi_irqs: %s" % (cpulist, _irqs, _msi_irqs))
     irqs = set_irq_affinity(False, _irqs, cpulist)
     msi_irqs = set_irq_affinity(False, _msi_irqs, cpulist)
     return (irqs, msi_irqs, numa_node, cpulist)