Skip to content

Synchronise yoga with upstream #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Synchronise yoga with upstream #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d55b308
Fix ACL sync when default sg group is created
mtomaska Mar 1, 2023
d0c5478
Merge "Fix ACL sync when default sg group is created" into stable/yoga
Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from neutron_lib.plugins import directory
from neutron_lib.utils import helpers
from oslo_log import log
from ovsdbapp.backend.ovs_idl import idlutils

from neutron.common.ovn import acl as acl_utils
from neutron.common.ovn import constants as ovn_const
Expand Down Expand Up @@ -99,7 +100,6 @@ def do_sync(self):
LOG.debug("Starting OVN-Northbound DB sync process")

ctx = context.get_admin_context()

self.sync_port_groups(ctx)
self.sync_networks_ports_and_dhcp_opts(ctx)
self.sync_port_dns_records(ctx)
Expand Down Expand Up @@ -298,11 +298,32 @@ def get_num_acls(ovn_acls):
'remove': num_acls_to_remove})

if self.mode == SYNC_MODE_REPAIR:
with self.ovn_api.transaction(check_error=True) as txn:
for acla in neutron_acls:
LOG.warning('ACL found in Neutron but not in '
'OVN DB for port group %s', acla['port_group'])
txn.add(self.ovn_api.pg_acl_add(**acla, may_exist=True))
pg_resync_count = 0
while True:
try:
with self.ovn_api.transaction(check_error=True) as txn:
for acla in neutron_acls:
LOG.warning('ACL found in Neutron but not in '
'OVN DB for port group %s',
acla['port_group'])
txn.add(self.ovn_api.pg_acl_add(
**acla, may_exist=True))
except idlutils.RowNotFound as row_err:
if row_err.msg.startswith("Cannot find Port_Group"):
if pg_resync_count < 1:
LOG.warning('Port group row was not found during '
'ACLs sync. Will attempt to sync port '
'groups one more time. The caught '
'exception is: %s', row_err)
self.sync_port_groups(ctx)
pg_resync_count += 1
continue
LOG.error('Port group exception during ACL sync '
'even after one more port group resync. '
'The caught exception is: %s', row_err)
else:
raise
break

with self.ovn_api.transaction(check_error=True) as txn:
for aclr in ovn_acls:
Expand Down