From 41fe9ff147244eb6d7573235fa12f45ed56be9b3 Mon Sep 17 00:00:00 2001 From: LIU Yulong Date: Wed, 20 Feb 2019 14:01:08 +0800 Subject: [PATCH] Change ovs-agent iteration log level to INFO Operators may want to see how long it takes in the port processing procedure since DEBUG log does not enable basically in the production envrionment. Related-Bug: #1813703 Related-Bug: #1813707 Related-Bug: #1813706 Related-Bug: #1813709 Conflicts: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py Change-Id: I43733546abf5421d0e3f4cd5a959d279e1b89d1e (cherry picked from commit 8e73de8bc42067c0a6796df3cca9938d25ae754e) --- .../openvswitch/agent/ovs_neutron_agent.py | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index b039f13c16a..160ce5cc7ff 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -1818,18 +1818,18 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, need_binding_devices, failed_devices['added']) = ( self.treat_devices_added_or_updated( devices_added_updated, provisioning_needed, re_added)) - LOG.debug("process_network_ports - iteration:%(iter_num)d - " - "treat_devices_added_or_updated completed. " - "Skipped %(num_skipped)d and no activated binding " - "devices %(num_no_active_binding)d of %(num_current)d " - "devices currently available. " - "Time elapsed: %(elapsed).3f", - {'iter_num': self.iter_num, - 'num_skipped': len(skipped_devices), - 'num_no_active_binding': - len(binding_no_activated_devices), - 'num_current': len(port_info['current']), - 'elapsed': time.time() - start}) + LOG.info("process_network_ports - iteration:%(iter_num)d - " + "treat_devices_added_or_updated completed. " + "Skipped %(num_skipped)d and no activated binding " + "devices %(num_no_active_binding)d of %(num_current)d " + "devices currently available. " + "Time elapsed: %(elapsed).3f", + {'iter_num': self.iter_num, + 'num_skipped': len(skipped_devices), + 'num_no_active_binding': + len(binding_no_activated_devices), + 'num_current': len(port_info['current']), + 'elapsed': time.time() - start}) # Update the list of current ports storing only those which # have been actually processed. skipped_devices = set(skipped_devices) @@ -1855,17 +1855,17 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, start = time.time() failed_devices['removed'] |= self.treat_devices_removed( port_info['removed']) - LOG.debug("process_network_ports - iteration:%(iter_num)d - " - "treat_devices_removed completed in %(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("process_network_ports - iteration:%(iter_num)d - " + "treat_devices_removed completed in %(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) if skipped_devices: start = time.time() self.treat_devices_skipped(skipped_devices) - LOG.debug("process_network_ports - iteration:%(iter_num)d - " - "treat_devices_skipped completed in %(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("process_network_ports - iteration:%(iter_num)d - " + "treat_devices_skipped completed in %(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) return failed_devices def process_install_ports_egress_flows(self, ports): @@ -1951,11 +1951,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, start = time.time() failed_added = self.treat_ancillary_devices_added( port_info['added']) - LOG.debug("process_ancillary_network_ports - iteration: " - "%(iter_num)d - treat_ancillary_devices_added " - "completed in %(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("process_ancillary_network_ports - iteration: " + "%(iter_num)d - treat_ancillary_devices_added " + "completed in %(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) failed_devices['added'] = failed_added if 'removed' in port_info and port_info['removed']: @@ -1964,11 +1964,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, port_info['removed']) failed_devices['removed'] = failed_removed - LOG.debug("process_ancillary_network_ports - iteration: " - "%(iter_num)d - treat_ancillary_devices_removed " - "completed in %(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("process_ancillary_network_ports - iteration: " + "%(iter_num)d - treat_ancillary_devices_removed " + "completed in %(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) return failed_devices @classmethod @@ -2063,12 +2063,12 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, def loop_count_and_wait(self, start_time, port_stats): # sleep till end of polling interval elapsed = time.time() - start_time - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d " - "completed. Processed ports statistics: " - "%(port_stats)s. Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'port_stats': port_stats, - 'elapsed': elapsed}) + LOG.info("Agent rpc_loop - iteration:%(iter_num)d " + "completed. Processed ports statistics: " + "%(port_stats)s. Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'port_stats': port_stats, + 'elapsed': elapsed}) if elapsed < self.polling_interval: time.sleep(self.polling_interval - elapsed) else: @@ -2140,11 +2140,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, if self.ancillary_brs: ancillary_port_info = self.scan_ancillary_ports( ancillary_ports, sync) - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d" - " - ancillary port info retrieved. " - "Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("Agent rpc_loop - iteration:%(iter_num)d" + " - ancillary port info retrieved. " + "Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) else: ancillary_port_info = {} @@ -2284,8 +2284,8 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, port_info = {} ancillary_port_info = {} start = time.time() - LOG.debug("Agent rpc_loop - iteration:%d started", - self.iter_num) + LOG.info("Agent rpc_loop - iteration:%d started", + self.iter_num) ovs_status = self.check_ovs_status() if ovs_status == constants.OVS_RESTARTED: self._handle_ovs_restart(polling_manager) @@ -2318,10 +2318,10 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, if (self._agent_has_updates(polling_manager) or sync or devices_need_retry): try: - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " - "starting polling. Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("Agent rpc_loop - iteration:%(iter_num)d - " + "starting polling. Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) # Save updated ports dict to perform rollback in # case resync would be needed, and then clear # self.updated_ports. As the greenthread should not yield @@ -2345,11 +2345,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, if ofport_changed_ports: port_info.setdefault('updated', set()).update( ofport_changed_ports) - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " - "port information retrieved. " - "Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("Agent rpc_loop - iteration:%(iter_num)d - " + "port information retrieved. " + "Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) # Secure and wire/unwire VIFs and update their status # on Neutron server if (self._port_info_has_changes(port_info) or @@ -2364,10 +2364,10 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, if need_clean_stale_flow: self.cleanup_stale_flows() need_clean_stale_flow = False - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " - "ports processed. Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("Agent rpc_loop - iteration:%(iter_num)d - " + "ports processed. Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) ports = port_info['current'] @@ -2375,11 +2375,11 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, failed_ancillary_devices = ( self.process_ancillary_network_ports( ancillary_port_info)) - LOG.debug("Agent rpc_loop - iteration: " - "%(iter_num)d - ancillary ports " - "processed. Elapsed:%(elapsed).3f", - {'iter_num': self.iter_num, - 'elapsed': time.time() - start}) + LOG.info("Agent rpc_loop - iteration: " + "%(iter_num)d - ancillary ports " + "processed. Elapsed:%(elapsed).3f", + {'iter_num': self.iter_num, + 'elapsed': time.time() - start}) ancillary_ports = ancillary_port_info['current'] polling_manager.polling_completed()