openstack/neutron
Code Issues Proposed changes

Add non-repair mode to the existing method in OVN sync class

Browse Source 
The methods ``sync_port_qos_policies`` and ``sync_fip_qos_policies``
didn't comply with the sync tool mode configured. The database should
be modified only in "repair" mode

Closes-Bug: #2115189
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: I582961895ad9f3714278b4707ffc1e20d9952c2f
This commit is contained in:
Rodolfo Alonso Hernandez
2025-06-23 09:51:02 +00:00
parent 2145901d6f
commit 3ad1b0b806
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View File

@@ -1362,12 +1362,25 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
LOG.debug('OVN-NB Sync port QoS policies started @ %s',
str(datetime.now()))
ovn_qos_ext = ovn_qos.OVNClientQosExtension(nb_idl=self.ovn_api)
with db_api.CONTEXT_READER.using(ctx), \
self.ovn_api.transaction(check_error=True) as txn:
_ports = []
with db_api.CONTEXT_READER.using(ctx):
for port in self.core_plugin.get_ports(ctx):
if not ovn_qos_ext.port_effective_qos_policy_id(port)[0]:
continue
ovn_qos_ext.create_port(txn, port, None)
_ports.append(port)
if not _ports:
# Nothing to do.
pass
elif not (self.mode == ovn_const.OVN_DB_SYNC_MODE_REPAIR or
self.is_maintenance):
for port in _ports:
LOG.warning('Port QoS policy missing in OVN NB DB, port_id=%s',
port['id'])
else:
with self.ovn_api.transaction(check_error=True) as txn:
for port in _ports:
ovn_qos_ext.create_port(txn, port, None)
LOG.debug('OVN-NB Sync port QoS policies completed @ %s',
str(datetime.now()))
@@ -1377,12 +1390,25 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
LOG.debug('OVN-NB Sync Floating IP QoS policies started @ %s',
str(datetime.now()))
ovn_qos_ext = ovn_qos.OVNClientQosExtension(nb_idl=self.ovn_api)
with db_api.CONTEXT_READER.using(ctx), \
self.ovn_api.transaction(check_error=True) as txn:
_fips = []
with db_api.CONTEXT_READER.using(ctx):
for fip in self.l3_plugin.get_floatingips(ctx):
if not fip.get('qos_policy_id'):
continue
ovn_qos_ext.create_floatingip(txn, fip)
_fips.append(fip)
if not _fips:
# Nothing to do.
pass
elif not (self.mode == ovn_const.OVN_DB_SYNC_MODE_REPAIR or
self.is_maintenance):
for fip in _fips:
LOG.warning('Floating IP QoS policy missing in OVN NB DB, '
'fip_id=%s', fip['id'])
else:
with self.ovn_api.transaction(check_error=True) as txn:
for fip in _fips:
ovn_qos_ext.create_floatingip(txn, fip)
LOG.debug('OVN-NB Sync Floating IP QoS policies completed @ %s',
str(datetime.now()))

6
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py
View File

@@ -1699,7 +1699,8 @@ class TestOvnNbSync(testlib_api.MySQLTestCaseMixin,
# Manually sync port QoS registers.
nb_synchronizer = ovn_db_sync.OvnNbSynchronizer(
self.plugin, self.mech_driver.nb_ovn, self.mech_driver.sb_ovn,
ovn_const.OVN_DB_SYNC_MODE_LOG, self.mech_driver)
ovn_const.OVN_DB_SYNC_MODE_LOG, self.mech_driver,
is_maintenance=True)
ctx = context.get_admin_context()
nb_synchronizer.sync_port_qos_policies(ctx)
self._validate_qos_records()
@@ -1785,7 +1786,8 @@ class TestOvnNbSync(testlib_api.MySQLTestCaseMixin,
# Manually sync port QoS registers.
nb_synchronizer = ovn_db_sync.OvnNbSynchronizer(
self.plugin, self.mech_driver.nb_ovn, self.mech_driver.sb_ovn,
ovn_const.OVN_DB_SYNC_MODE_LOG, self.mech_driver)
ovn_const.OVN_DB_SYNC_MODE_LOG, self.mech_driver,
is_maintenance=True)
ctx = context.get_admin_context()
nb_synchronizer.sync_fip_qos_policies(ctx)
self._validate_qos_records()