Skip to content

Commit b5bf628

Browse files
markgoddardmarkgoddard
authored
Merge pull request #171 from stackhpc/upstream/2023.1-2024-08-19
Synchronise 2023.1 with upstream
2 parents 744847f + 271bb48 commit b5bf628

File tree

13 files changed

+246
-39
lines changed

13 files changed

+246
-39
lines changed

‎neutron/common/ovn/constants.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@
274274
TYPE_SECURITY_GROUP_RULES)
275275

276276
DB_CONSISTENCY_CHECK_INTERVAL = 300 # 5 minutes
277+
MAINTENANCE_TASK_RETRY_LIMIT = 100 # times
278+
MAINTENANCE_ONE_RUN_TASK_SPACING = 5 # seconds
277279

278280
# The order in which the resources should be created or updated by the
279281
# maintenance task: Root ones first and leafs at the end.

‎neutron/db/external_net_db.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ def _network_filter_hook(context, original_model, conditions):
5151
(rbac_model.target_project == context.tenant_id) |
5252
(rbac_model.target_project == '*'))
5353
conditions = expr.or_(tenant_allowed, *conditions)
54+
conditions = expr.or_(original_model.tenant_id == context.tenant_id,
55+
*conditions)
5456
return conditions
5557

5658

‎neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py‎

Lines changed: 76 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,28 @@
5454
INCONSISTENCY_TYPE_DELETE = 'delete'
5555

5656

57-
def has_lock_periodic(*args, **kwargs):
57+
def has_lock_periodic(*args, periodic_run_limit=0, **kwargs):
5858
def wrapper(f):
59+
_retries = 0
60+
5961
@functools.wraps(f)
6062
@periodics.periodic(*args, **kwargs)
6163
def decorator(self, *args, **kwargs):
6264
# This periodic task is included in DBInconsistenciesPeriodics
6365
# since it uses the lock to ensure only one worker is executing
66+
# additonally, if periodic_run_limit parameter with value > 0 is
67+
# provided and lock is not acquired for periodic_run_limit
68+
# times, task will not be run anymore by this maintenance worker
69+
nonlocal _retries
6470
if not self.has_lock:
71+
if periodic_run_limit > 0:
72+
if _retries >= periodic_run_limit:
73+
LOG.debug("Have not been able to acquire lock to run "
74+
"task '%s' after %s tries, limit reached. "
75+
"No more attempts will be made.",
76+
f, _retries)
77+
raise periodics.NeverAgain()
78+
_retries += 1
6579
return
6680
return f(self, *args, **kwargs)
6781
return decorator
@@ -481,7 +495,10 @@ def _delete_floatingip_and_pf(self, context, fip_id):
481495

482496
# A static spacing value is used here, but this method will only run
483497
# once per lock due to the use of periodics.NeverAgain().
484-
@has_lock_periodic(spacing=600, run_immediately=True)
498+
@has_lock_periodic(
499+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
500+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
501+
run_immediately=True)
485502
def check_global_dhcp_opts(self):
486503
if (not ovn_conf.get_global_dhcpv4_opts() and
487504
not ovn_conf.get_global_dhcpv6_opts()):
@@ -511,7 +528,10 @@ def check_global_dhcp_opts(self):
511528

512529
# A static spacing value is used here, but this method will only run
513530
# once per lock due to the use of periodics.NeverAgain().
514-
@has_lock_periodic(spacing=600, run_immediately=True)
531+
@has_lock_periodic(
532+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
533+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
534+
run_immediately=True)
515535
def check_for_igmp_snoop_support(self):
516536
with self._nb_idl.transaction(check_error=True) as txn:
517537
value = ('true' if ovn_conf.is_igmp_snooping_enabled()
@@ -531,7 +551,10 @@ def check_for_igmp_snoop_support(self):
531551
# TODO(czesla): Remove this in the A+4 cycle
532552
# A static spacing value is used here, but this method will only run
533553
# once per lock due to the use of periodics.NeverAgain().
534-
@has_lock_periodic(spacing=600, run_immediately=True)
554+
@has_lock_periodic(
555+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
556+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
557+
run_immediately=True)
535558
def check_port_has_address_scope(self):
536559
ports = self._nb_idl.db_find_rows(
537560
"Logical_Switch_Port", ("type", "!=", ovn_const.LSP_TYPE_LOCALNET)
@@ -574,7 +597,10 @@ def _delete_default_ha_chassis_group(self, txn):
574597

575598
# A static spacing value is used here, but this method will only run
576599
# once per lock due to the use of periodics.NeverAgain().
577-
@has_lock_periodic(spacing=600, run_immediately=True)
600+
@has_lock_periodic(
601+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
602+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
603+
run_immediately=True)
578604
def check_for_ha_chassis_group(self):
579605
# If external ports is not supported stop running
580606
# this periodic task
@@ -604,7 +630,10 @@ def check_for_ha_chassis_group(self):
604630
# TODO(lucasagomes): Remove this in the B+3 cycle
605631
# A static spacing value is used here, but this method will only run
606632
# once per lock due to the use of periodics.NeverAgain().
607-
@has_lock_periodic(spacing=600, run_immediately=True)
633+
@has_lock_periodic(
634+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
635+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
636+
run_immediately=True)
608637
def check_for_mcast_flood_reports(self):
609638
cmds = []
610639
for port in self._nb_idl.lsp_list().execute(check_error=True):
@@ -703,7 +732,10 @@ def update_port_qos_with_external_ids_reference(self):
703732

704733
# A static spacing value is used here, but this method will only run
705734
# once per lock due to the use of periodics.NeverAgain().
706-
@has_lock_periodic(spacing=600, run_immediately=True)
735+
@has_lock_periodic(
736+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
737+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
738+
run_immediately=True)
707739
def check_redirect_type_router_gateway_ports(self):
708740
"""Check OVN router gateway ports
709741
Check for the option "redirect-type=bridged" value for
@@ -761,7 +793,10 @@ def check_redirect_type_router_gateway_ports(self):
761793

762794
# A static spacing value is used here, but this method will only run
763795
# once per lock due to the use of periodics.NeverAgain().
764-
@has_lock_periodic(spacing=600, run_immediately=True)
796+
@has_lock_periodic(
797+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
798+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
799+
run_immediately=True)
765800
def check_vlan_distributed_ports(self):
766801
"""Check VLAN distributed ports
767802
Check for the option "reside-on-redirect-chassis" value for
@@ -772,10 +807,7 @@ def check_vlan_distributed_ports(self):
772807
# Get router ports belonging to VLAN networks
773808
vlan_nets = self._ovn_client._plugin.get_networks(
774809
context, {pnet.NETWORK_TYPE: [n_const.TYPE_VLAN]})
775-
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
776-
# is_provider_network check should be removed
777-
vlan_net_ids = [vn['id'] for vn in vlan_nets
778-
if not utils.is_provider_network(vn)]
810+
vlan_net_ids = [vn['id'] for vn in vlan_nets]
779811
router_ports = self._ovn_client._plugin.get_ports(
780812
context, {'network_id': vlan_net_ids,
781813
'device_owner': n_const.ROUTER_PORT_OWNERS})
@@ -802,7 +834,10 @@ def check_vlan_distributed_ports(self):
802834
# a gateway (that means, that has "external_ids:OVN_GW_PORT_EXT_ID_KEY").
803835
# A static spacing value is used here, but this method will only run
804836
# once per lock due to the use of periodics.NeverAgain().
805-
@has_lock_periodic(spacing=600, run_immediately=True)
837+
@has_lock_periodic(
838+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
839+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
840+
run_immediately=True)
806841
def update_logical_router_with_gateway_network_id(self):
807842
"""Update all OVN logical router registers with the GW network ID"""
808843
cmds = []
@@ -829,7 +864,10 @@ def update_logical_router_with_gateway_network_id(self):
829864

830865
# A static spacing value is used here, but this method will only run
831866
# once per lock due to the use of periodics.NeverAgain().
832-
@has_lock_periodic(spacing=600, run_immediately=True)
867+
@has_lock_periodic(
868+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
869+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
870+
run_immediately=True)
833871
def check_baremetal_ports_dhcp_options(self):
834872
"""Update baremetal ports DHCP options
835873
@@ -912,7 +950,10 @@ def update_port_virtual_type(self):
912950
raise periodics.NeverAgain()
913951

914952
# TODO(ralonsoh): Remove this in the Antelope+4 cycle
915-
@has_lock_periodic(spacing=600, run_immediately=True)
953+
@has_lock_periodic(
954+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
955+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
956+
run_immediately=True)
916957
def create_router_extra_attributes_registers(self):
917958
"""Create missing ``RouterExtraAttributes`` registers.
918959
@@ -933,7 +974,10 @@ def create_router_extra_attributes_registers(self):
933974
raise periodics.NeverAgain()
934975

935976
# TODO(slaweq): Remove this in the E cycle (C+2 as it will be next SLURP)
936-
@periodics.periodic(spacing=600, run_immediately=True)
977+
@has_lock_periodic(
978+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
979+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
980+
run_immediately=True)
937981
def add_gw_port_info_to_logical_router_port(self):
938982
"""Add info if LRP is connecting internal subnet or ext gateway."""
939983
cmds = []
@@ -969,7 +1013,10 @@ def add_gw_port_info_to_logical_router_port(self):
9691013
txn.add(cmd)
9701014
raise periodics.NeverAgain()
9711015

972-
@has_lock_periodic(spacing=600, run_immediately=True)
1016+
@has_lock_periodic(
1017+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
1018+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
1019+
run_immediately=True)
9731020
def check_router_default_route_empty_dst_ip(self):
9741021
"""Check routers with default route with empty dst-ip (LP: #2002993).
9751022
"""
@@ -994,7 +1041,10 @@ def check_router_default_route_empty_dst_ip(self):
9941041
raise periodics.NeverAgain()
9951042

9961043
# TODO(ralonsoh): Remove this in the Antelope+4 cycle
997-
@has_lock_periodic(spacing=600, run_immediately=True)
1044+
@has_lock_periodic(
1045+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
1046+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
1047+
run_immediately=True)
9981048
def add_vnic_type_and_pb_capabilities_to_lsp(self):
9991049
"""Add the port VNIC type and port binding capabilities to the LSP.
10001050
@@ -1026,7 +1076,10 @@ def add_vnic_type_and_pb_capabilities_to_lsp(self):
10261076

10271077
raise periodics.NeverAgain()
10281078

1029-
@has_lock_periodic(spacing=600, run_immediately=True)
1079+
@has_lock_periodic(
1080+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
1081+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
1082+
run_immediately=True)
10301083
def check_fair_meter_consistency(self):
10311084
"""Update the logging meter after neutron-server reload
10321085
@@ -1108,7 +1161,10 @@ def cleanup_old_hash_ring_nodes(self):
11081161
context = n_context.get_admin_context()
11091162
hash_ring_db.cleanup_old_nodes(context, days=5)
11101163

1111-
@periodics.periodic(spacing=600, run_immediately=True)
1164+
@has_lock_periodic(
1165+
periodic_run_limit=ovn_const.MAINTENANCE_TASK_RETRY_LIMIT,
1166+
spacing=ovn_const.MAINTENANCE_ONE_RUN_TASK_SPACING,
1167+
run_immediately=True)
11121168
def update_nat_floating_ip_with_gateway_port_reference(self):
11131169
"""Set NAT rule gateway_port column to any floating IP without
11141170
router gateway port uuid reference - LP#2035281.

‎neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,8 +1610,6 @@ def _gen_router_port_options(self, port, network=None):
16101610
# logical router port is centralized in the chassis hosting the
16111611
# distributed gateway port.
16121612
# https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996
1613-
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
1614-
# is_provider_network check should be removed
16151613
if network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN:
16161614
reside_redir_ch = self._get_reside_redir_for_gateway_port(
16171615
port['device_id'])

‎neutron/tests/unit/extensions/test_external_net.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,17 @@ def test_network_filter_hook_admin_context(self):
142142
def test_network_filter_hook_nonadmin_context(self):
143143
ctx = context.Context('edinson', 'cavani')
144144
model = models_v2.Network
145-
txt = ("networkrbacs.action = :action_1 AND "
145+
txt = ("networks.project_id = :project_id_1 OR "
146+
"networkrbacs.action = :action_1 AND "
146147
"networkrbacs.target_project = :target_project_1 OR "
147148
"networkrbacs.target_project = :target_project_2")
148149
conditions = external_net_db._network_filter_hook(ctx, model, [])
149150
self.assertEqual(conditions.__str__(), txt)
150151
# Try to concatenate conditions
151152
txt2 = (txt.replace('project_1', 'project_3').
152153
replace('project_2', 'project_4').
153-
replace('action_1', 'action_2'))
154+
replace('action_1', 'action_2').
155+
replace('project_id_1', 'project_id_2'))
154156
conditions = external_net_db._network_filter_hook(ctx, model,
155157
conditions)
156158
self.assertEqual(conditions.__str__(), "%s OR %s" % (txt, txt2))

‎neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,69 @@
3232
from neutron.objects import ports as ports_obj
3333
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import maintenance
3434
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import ovn_db_sync
35+
from neutron.tests import base
3536
from neutron.tests.unit import fake_resources as fakes
3637
from neutron.tests.unit.plugins.ml2 import test_security_group as test_sg
3738
from neutron.tests.unit import testlib_api
3839
from neutron_lib import exceptions as n_exc
3940

4041

42+
class TestHasLockPeriodicDecorator(base.BaseTestCase):
43+
44+
def test_decorator_no_limit_have_lock(self):
45+
run_counter = 0
46+
47+
@maintenance.has_lock_periodic(
48+
periodic_run_limit=0, spacing=30)
49+
def test_maintenance_task(worker):
50+
nonlocal run_counter
51+
run_counter += 1
52+
53+
worker_mock = mock.MagicMock()
54+
worker_mock.has_lock = True
55+
56+
for _ in range(3):
57+
test_maintenance_task(worker_mock)
58+
self.assertEqual(3, run_counter)
59+
60+
def test_decorator_no_lock_no_limit(self):
61+
run_counter = 0
62+
63+
@maintenance.has_lock_periodic(
64+
periodic_run_limit=0, spacing=30)
65+
def test_maintenance_task(worker):
66+
nonlocal run_counter
67+
run_counter += 1
68+
69+
worker_mock = mock.MagicMock()
70+
has_lock_values = [False, False, True]
71+
72+
for has_lock in has_lock_values:
73+
worker_mock.has_lock = has_lock
74+
test_maintenance_task(worker_mock)
75+
self.assertEqual(1, run_counter)
76+
77+
def test_decorator_no_lock_with_limit(self):
78+
run_counter = 0
79+
80+
@maintenance.has_lock_periodic(
81+
periodic_run_limit=1, spacing=30)
82+
def test_maintenance_task(worker):
83+
nonlocal run_counter
84+
run_counter += 1
85+
86+
worker_mock = mock.MagicMock()
87+
88+
worker_mock.has_lock = False
89+
test_maintenance_task(worker_mock)
90+
self.assertEqual(0, run_counter)
91+
92+
worker_mock.has_lock = False
93+
self.assertRaises(periodics.NeverAgain,
94+
test_maintenance_task, worker_mock)
95+
self.assertEqual(0, run_counter)
96+
97+
4198
class TestSchemaAwarePeriodicsBase(testlib_api.SqlTestCaseLight):
4299

43100
def test__set_schema_aware_periodics(self):

‎zuul.d/base.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@
3333
- ^roles/add_mariadb_repo/.*$
3434
- ^roles/nftables/.*$
3535
- ^rally-jobs/.*$
36-
- ^zuul.d/(?!(project)).*\.yaml
36+
# Ignore everything except for zuul.d/project.yaml
37+
- ^zuul.d/base.yaml
38+
- ^zuul.d/grenade.yaml
39+
- ^zuul.d/job-templates.yaml
40+
- ^zuul.d/rally.yaml
41+
- ^zuul.d/tempest-multinode.yaml
42+
- ^zuul.d/tempest-singlenode.yaml
3743
vars:
3844
configure_swap_size: 8192
3945
Q_BUILD_OVS_FROM_GIT: True
@@ -96,7 +102,13 @@
96102
- ^roles/add_mariadb_repo/.*$
97103
- ^roles/nftables/.*$
98104
- ^rally-jobs/.*$
99-
- ^zuul.d/(?!(project)).*\.yaml
105+
# Ignore everything except for zuul.d/project.yaml
106+
- ^zuul.d/base.yaml
107+
- ^zuul.d/grenade.yaml
108+
- ^zuul.d/job-templates.yaml
109+
- ^zuul.d/rally.yaml
110+
- ^zuul.d/tempest-multinode.yaml
111+
- ^zuul.d/tempest-singlenode.yaml
100112

101113
- job:
102114
name: neutron-fullstack-with-uwsgi

‎zuul.d/grenade.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
- ^roles/.*functional.*$
3535
- ^playbooks/.*functional.*$
3636
- ^vagrant/.*$
37-
- ^zuul.d/(?!(project)).*\.yaml
37+
# Ignore everything except for zuul.d/project.yaml
38+
- ^zuul.d/base.yaml
39+
- ^zuul.d/grenade.yaml
40+
- ^zuul.d/job-templates.yaml
41+
- ^zuul.d/rally.yaml
42+
- ^zuul.d/tempest-multinode.yaml
43+
- ^zuul.d/tempest-singlenode.yaml
3844
vars:
3945
grenade_devstack_localrc:
4046
shared:
@@ -249,7 +255,13 @@
249255
- ^roles/.*functional.*$
250256
- ^playbooks/.*functional.*$
251257
- ^vagrant/.*$
252-
- ^zuul.d/(?!(project)).*\.yaml
258+
# Ignore everything except for zuul.d/project.yaml
259+
- ^zuul.d/base.yaml
260+
- ^zuul.d/grenade.yaml
261+
- ^zuul.d/job-templates.yaml
262+
- ^zuul.d/rally.yaml
263+
- ^zuul.d/tempest-multinode.yaml
264+
- ^zuul.d/tempest-singlenode.yaml
253265
roles:
254266
- zuul: openstack/neutron-tempest-plugin
255267
required-projects:

0 commit comments

Comments
 (0)