Merge "Replace `ReaderWriterLock with threading.RLock`"

neutron/agent/dhcp/agent.py

@@ -24,7 +24,6 @@ from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib import context
 from neutron_lib import exceptions
-from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
@@ -46,7 +45,7 @@ from neutron.common import utils
 from neutron import manager
 
 LOG = logging.getLogger(__name__)
-_SYNC_STATE_LOCK = lockutils.ReaderWriterLock()
+_SYNC_STATE_LOCK = threading.RLock()
 
 DEFAULT_PRIORITY = 255
 
@@ -59,7 +58,7 @@ def _sync_lock(f):
     """Decorator to block all operations for a global sync call."""
     @functools.wraps(f)
     def wrapped(*args, **kwargs):
-        with _SYNC_STATE_LOCK.write_lock():
+        with _SYNC_STATE_LOCK:
             return f(*args, **kwargs)
     return wrapped
 
@@ -68,7 +67,7 @@ def _wait_if_syncing(f):
     """Decorator to wait if any sync operations are in progress."""
     @functools.wraps(f)
     def wrapped(*args, **kwargs):
-        with _SYNC_STATE_LOCK.read_lock():
+        with _SYNC_STATE_LOCK:
             return f(*args, **kwargs)
     return wrapped
 

neutron/agent/ovn/extensions/metadata.py

@@ -15,8 +15,8 @@
 import collections
 import functools
 import re
+import threading
 
-from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log
 from ovsdbapp.backend.ovs_idl import vlog
@@ -35,7 +35,7 @@ from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf as config
 LOG = log.getLogger(__name__)
 EXT_NAME = 'metadata'
 agents_db.register_db_agents_opts()
-_SYNC_STATE_LOCK = lockutils.ReaderWriterLock()
+_SYNC_STATE_LOCK = threading.RLock()
 CHASSIS_METADATA_LOCK = 'chassis_metadata_lock'
 
 SB_IDL_TABLES = ['Encap',
@@ -60,7 +60,7 @@ def _sync_lock(f):
     """Decorator to block all operations for a global sync call."""
     @functools.wraps(f)
     def wrapped(*args, **kwargs):
-        with _SYNC_STATE_LOCK.write_lock():
+        with _SYNC_STATE_LOCK:
             return f(*args, **kwargs)
     return wrapped
 

neutron/agent/ovn/metadata/agent.py

@@ -22,7 +22,6 @@ import uuid
 
 import netaddr
 from neutron_lib import constants as n_const
-from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import netutils
@@ -45,7 +44,7 @@ from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf as config
 
 LOG = log.getLogger(__name__)
 agents_db.register_db_agents_opts()
-_SYNC_STATE_LOCK = lockutils.ReaderWriterLock()
+_SYNC_STATE_LOCK = threading.RLock()
 CHASSIS_METADATA_LOCK = 'chassis_metadata_lock'
 
 NS_PREFIX = ovn_const.OVN_METADATA_PREFIX
@@ -64,7 +63,7 @@ def _sync_lock(f):
     """Decorator to block all operations for a global sync call."""
     @functools.wraps(f)
     def wrapped(*args, **kwargs):
-        with _SYNC_STATE_LOCK.write_lock():
+        with _SYNC_STATE_LOCK:
             return f(*args, **kwargs)
     return wrapped
 
@@ -139,7 +138,7 @@ class PortBindingEvent(_OVNExtensionEvent, row_event.RowEvent):
         # the metadata namespace accordingly.
         resync = False
 
-        with _SYNC_STATE_LOCK.read_lock():
+        with _SYNC_STATE_LOCK:
             self.log_row(row)
             try:
                 self.agent.provision_datapath(row)