openstack/ovn-bgp-agent
Code Issues Proposed changes

Merge "Retry get_ovs_patch_port_ofport if empty port"

Browse Source
This commit is contained in:
Zuul 2023-06-15 09:55:37 +00:00 committed by Gerrit Code Review
commit a5d8436049
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ovn_bgp_agent/drivers/openstack/utils/ovs.py
View File

@ -18,8 +18,10 @@ from ovsdbapp.backend.ovs_idl import connection
from ovsdbapp.backend.ovs_idl import idlutils from ovsdbapp.backend.ovs_idl import idlutils
from ovsdbapp.schema.open_vswitch import impl_idl as idl_ovs from ovsdbapp.schema.open_vswitch import impl_idl as idl_ovs
import pyroute2 import pyroute2
import tenacity
from ovn_bgp_agent import constants from ovn_bgp_agent import constants
from ovn_bgp_agent import exceptions as agent_exc
import ovn_bgp_agent.privileged.ovs_vsctl import ovn_bgp_agent.privileged.ovs_vsctl
from ovn_bgp_agent.utils import linux_net from ovn_bgp_agent.utils import linux_net
@ -62,10 +64,24 @@ def get_ovs_patch_ports_info(bridge):
return in_ports return in_ports
@tenacity.retry(
retry=tenacity.retry_if_exception_type(agent_exc.PatchPortNotFound),
wait=tenacity.wait_fixed(1),
stop=tenacity.stop_after_delay(5),
reraise=True)
def get_ovs_patch_port_ofport(patch): def get_ovs_patch_port_ofport(patch):
patch_name = "patch-{}-to-br-int".format(patch) patch_name = "patch-{}-to-br-int".format(patch)
ofport = ovn_bgp_agent.privileged.ovs_vsctl.ovs_cmd( try:
'ovs-vsctl', ['get', 'Interface', patch_name, 'ofport'])[0].rstrip() ofport = ovn_bgp_agent.privileged.ovs_vsctl.ovs_cmd(
'ovs-vsctl', ['get', 'Interface', patch_name, 'ofport']
)[0].rstrip()
except Exception:
raise agent_exc.PatchPortNotFound(localnet=patch)
if ofport == '[]':
# NOTE(ltomasbo): there is a chance the patch port interface was
# created but not yet added to ovs bridge, therefore it exists but
# has an empty ofport. We should retry in this case
raise agent_exc.PatchPortNotFound(localnet=patch)
return ofport return ofport

11
ovn_bgp_agent/drivers/openstack/utils/wire.py
View File

@ -16,7 +16,6 @@ import pyroute2
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import tenacity
from ovn_bgp_agent import constants from ovn_bgp_agent import constants
from ovn_bgp_agent.drivers.openstack.utils import ovs from ovn_bgp_agent.drivers.openstack.utils import ovs
@ -139,16 +138,8 @@ def unwire_provider_port(routing_tables_routes, port_ips, bridge_device,
return True return True
@tenacity.retry(
retry=tenacity.retry_if_exception_type(agent_exc.PatchPortNotFound),
wait=tenacity.wait_fixed(1),
stop=tenacity.stop_after_delay(5),
reraise=True)
def _ensure_updated_mac_tweak_flows(localnet, bridge_device, ovs_flows): def _ensure_updated_mac_tweak_flows(localnet, bridge_device, ovs_flows):
try: ofport = ovs.get_ovs_patch_port_ofport(localnet)
ofport = ovs.get_ovs_patch_port_ofport(localnet)
except Exception:
raise agent_exc.PatchPortNotFound(localnet=localnet)
if ofport not in ovs_flows[bridge_device]['in_port']: if ofport not in ovs_flows[bridge_device]['in_port']:
ovs_flows[bridge_device]['in_port'].append(ofport) ovs_flows[bridge_device]['in_port'].append(ofport)
ovs.ensure_mac_tweak_flows(bridge_device, ovs.ensure_mac_tweak_flows(bridge_device,