Merge "Use has_lock_periodic decorator for the tasks which require ovn db lock" into stable/2023.1

Author: Zuul

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

@@ -320,7 +320,7 @@ def migrate_to_stateful_fips(self):
     # to perform the migration every 10 seconds until completed.
     # TODO(jlibosva): Remove the migration to port groups at some point. It's
     # been around since Queens release so it is good to drop this soon.
-    @periodics.periodic(spacing=10, run_immediately=True)
+    @has_lock_periodic(spacing=10, run_immediately=True)
     @rerun_on_schema_updates
     def migrate_to_port_groups(self):
         """Perform the migration from Address Sets to Port Groups. """
@@ -332,11 +332,6 @@ def migrate_to_port_groups(self):
         if not self._nb_idl.get_address_sets():
             raise periodics.NeverAgain()
 
-        # Only the worker holding a valid lock within OVSDB will perform the
-        # migration.
-        if not self.has_lock:
-            return
-
         admin_context = n_context.get_admin_context()
         nb_sync = ovn_db_sync.OvnNbSynchronizer(
             self._ovn_client._plugin, self._nb_idl, self._ovn_client._sb_idl,
@@ -579,16 +574,13 @@ def _delete_default_ha_chassis_group(self, txn):
 
     # A static spacing value is used here, but this method will only run
     # once per lock due to the use of periodics.NeverAgain().
-    @periodics.periodic(spacing=600, run_immediately=True)
+    @has_lock_periodic(spacing=600, run_immediately=True)
     def check_for_ha_chassis_group(self):
         # If external ports is not supported stop running
         # this periodic task
         if not self._ovn_client.is_external_ports_supported():
             raise periodics.NeverAgain()
 
-        if not self.has_lock:
-            return
-
         external_ports = self._nb_idl.db_find_rows(
             'Logical_Switch_Port', ('type', '=', ovn_const.LSP_TYPE_EXTERNAL)
         ).execute(check_error=True)
@@ -680,16 +672,13 @@ def check_router_mac_binding_options(self):
     # TODO(ralonsoh): Remove this in the Z+2 cycle
     # A static spacing value is used here, but this method will only run
     # once per lock due to the use of periodics.NeverAgain().
-    @periodics.periodic(spacing=600, run_immediately=True)
+    @has_lock_periodic(spacing=600, run_immediately=True)
     def update_port_qos_with_external_ids_reference(self):
         """Update all OVN QoS registers with the port ID
 
         This method will only update the OVN QoS registers related to port QoS,
         not FIP QoS. FIP QoS have the corresponding "external_ids" reference.
         """
-        if not self.has_lock:
-            return
-
         regex = re.compile(
             r'(inport|outport) == \"(?P<port_id>[a-z0-9\-]{36})\"')
         cmds = []
@@ -840,7 +829,7 @@ def update_logical_router_with_gateway_network_id(self):
 
     # A static spacing value is used here, but this method will only run
     # once per lock due to the use of periodics.NeverAgain().
-    @periodics.periodic(spacing=600, run_immediately=True)
+    @has_lock_periodic(spacing=600, run_immediately=True)
     def check_baremetal_ports_dhcp_options(self):
         """Update baremetal ports DHCP options
 
@@ -852,9 +841,6 @@ def check_baremetal_ports_dhcp_options(self):
         if not self._ovn_client.is_external_ports_supported():
             raise periodics.NeverAgain()
 
-        if not self.has_lock:
-            return
-
         context = n_context.get_admin_context()
         ports = ports_obj.Port.get_ports_by_vnic_type_and_host(
             context, portbindings.VNIC_BAREMETAL)
@@ -1056,7 +1042,7 @@ def check_fair_meter_consistency(self):
                                                    from_reload=True)
         raise periodics.NeverAgain()
 
-    @periodics.periodic(spacing=300, run_immediately=True)
+    @has_lock_periodic(spacing=300, run_immediately=True)
     def remove_duplicated_chassis_registers(self):
         """Remove the "Chassis" and "Chassis_Private" duplicated registers.
 
@@ -1075,9 +1061,6 @@ def remove_duplicated_chassis_registers(self):
         if not self._sb_idl.is_table_present('Chassis_Private'):
             raise periodics.NeverAgain()
 
-        if not self.has_lock:
-            return
-
         # dup_chassis_port_host = {host_name: [(ch1, ch_private1),
         #                                      (ch2, ch_private2), ... ]}
         dup_chassis_port_host = {}