openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] Avoid deadlock when cleaning hash ring nodes" into stable/victoria

This commit is contained in:
Zuul 2022-10-17 19:07:38 +00:00 committed by Gerrit Code Review
parent d200a0f07f c336814d0d
commit 74dc58c839
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@ -118,10 +118,6 @@ class OVNMechanismDriver(api.MechanismDriver):
self.node_uuid = None
self.hash_ring_group = ovn_const.HASH_RING_ML2_GROUP
self.sg_enabled = ovn_acl.is_sg_enabled()
# NOTE(lucasagomes): _clean_hash_ring() must be called before
# self.subscribe() to avoid processes racing when adding or
# deleting nodes from the Hash Ring during service initialization
self._clean_hash_ring()
self._post_fork_event = threading.Event()
if cfg.CONF.SECURITYGROUP.firewall_driver:
LOG.warning('Firewall driver configuration is ignored')
@ -307,8 +303,19 @@ class OVNMechanismDriver(api.MechanismDriver):
service.RpcWorker)
@lockutils.synchronized('hash_ring_probe_lock', external=True)
def _start_hash_ring_probe(self):
def _setup_hash_ring(self):
"""Setup the hash ring.
The first worker to acquire the lock is responsible for cleaning
the hash ring from previous runs as well as start the probing
thread for this host. Subsequently workers just need to register
themselves to the hash ring.
"""
admin_context = n_context.get_admin_context()
if not self._hash_ring_probe_event.is_set():
self._clean_hash_ring()
self.node_uuid = ovn_hash_ring_db.add_node(admin_context,
self.hash_ring_group)
self._hash_ring_thread = maintenance.MaintenanceThread()
self._hash_ring_thread.add_periodics(
maintenance.HashRingHealthCheckPeriodics(
@ -316,6 +323,9 @@ class OVNMechanismDriver(api.MechanismDriver):
self._hash_ring_thread.start()
LOG.info("Hash Ring probing thread has started")
self._hash_ring_probe_event.set()
else:
self.node_uuid = ovn_hash_ring_db.add_node(admin_context,
self.hash_ring_group)
def post_fork_initialize(self, resource, event, trigger, payload=None):
# Initialize API/Maintenance workers with OVN IDL connections
@ -328,10 +338,7 @@ class OVNMechanismDriver(api.MechanismDriver):
self._ovn_client_inst = None
if worker_class == neutron.wsgi.WorkerService:
admin_context = n_context.get_admin_context()
self.node_uuid = ovn_hash_ring_db.add_node(admin_context,
self.hash_ring_group)
self._start_hash_ring_probe()
self._setup_hash_ring()
n_agent.AgentCache(self) # Initialize singleton agent cache
self._nb_ovn, self._sb_ovn = impl_idl_ovn.get_ovn_idls(self, trigger)