openstack/neutron
Code Issues Proposed changes

Merge "Add 3 retry attempts to initialize ovs agent"

Browse Source
This commit is contained in:
Zuul 2019-08-08 20:07:56 +00:00 committed by Gerrit Code Review
commit f41f2a22cf
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -45,6 +45,7 @@ from oslo_service import loopingcall
from oslo_service import systemd from oslo_service import systemd
from oslo_utils import netutils from oslo_utils import netutils
from osprofiler import profiler from osprofiler import profiler
from ovsdbapp import exceptions as ovs_exceptions
import six import six
from neutron._i18n import _ from neutron._i18n import _
@ -83,6 +84,8 @@ cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.agent.' cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.agent.'
'common.config') 'common.config')
INIT_MAX_TRIES = 3
class _mac_mydialect(netaddr.mac_unix): class _mac_mydialect(netaddr.mac_unix):
word_fmt = '%.2x' word_fmt = '%.2x'
@ -2568,10 +2571,22 @@ def main(bridge_classes):
validate_tunnel_config(cfg.CONF.AGENT.tunnel_types, cfg.CONF.OVS.local_ip) validate_tunnel_config(cfg.CONF.AGENT.tunnel_types, cfg.CONF.OVS.local_ip)
init_try = 1
while True:
try: try:
agent = OVSNeutronAgent(bridge_classes, ext_mgr, cfg.CONF) agent = OVSNeutronAgent(bridge_classes, ext_mgr, cfg.CONF)
capabilities.notify_init_event(n_const.AGENT_TYPE_OVS, agent) capabilities.notify_init_event(n_const.AGENT_TYPE_OVS, agent)
break
except ovs_exceptions.TimeoutException as e:
if init_try < INIT_MAX_TRIES:
LOG.warning("Ovsdb command timeout!")
init_try += 1
else:
LOG.error("%(err)s agent terminated after %(attempts)s "
"initialization attempts!",
{'err': e, 'attempts': init_try})
sys.exit(1)
except (RuntimeError, ValueError) as e: except (RuntimeError, ValueError) as e:
LOG.error("%s Agent terminated!", e) LOG.error("%s agent terminated!", e)
sys.exit(1) sys.exit(1)
agent.daemon_loop() agent.daemon_loop()