diff --git a/oslo/messaging/rpc/client.py b/oslo/messaging/rpc/client.py
index 3d2e8963b..5e2d1d7f4 100644
--- a/oslo/messaging/rpc/client.py
+++ b/oslo/messaging/rpc/client.py
@@ -23,7 +23,6 @@ __all__ = [
'RemoteError',
]
-import inspect
import logging
from oslo.config import cfg
@@ -88,14 +87,13 @@ class _CallContext(object):
_marker = object()
def __init__(self, transport, target, serializer,
- timeout=None, check_for_lock=None, version_cap=None):
+ timeout=None, version_cap=None):
self.conf = transport.conf
self.transport = transport
self.target = target
self.serializer = serializer
self.timeout = timeout
- self.check_for_lock = check_for_lock
self.version_cap = version_cap
super(_CallContext, self).__init__()
@@ -138,16 +136,6 @@ class _CallContext(object):
except driver_base.TransportDriverError as ex:
raise ClientSendError(self.target, ex)
- def _check_for_lock(self):
- locks_held = self.check_for_lock(self.conf)
- if locks_held:
- stack = ' :: '.join([frame[3] for frame in inspect.stack()])
- _LOG.warning('An RPC is being made while holding a lock. The '
- 'locks currently held are %(locks)s. This is '
- 'probably a bug. Please report it. Include the '
- 'following: [%(stack)s].',
- {'locks': locks_held, 'stack': stack})
-
def call(self, ctxt, method, **kwargs):
"""Invoke a method and wait for a reply. See RPCClient.call()."""
msg = self._make_message(ctxt, method, kwargs)
@@ -157,8 +145,6 @@ class _CallContext(object):
if self.timeout is None:
timeout = self.conf.rpc_response_timeout
- if self.check_for_lock:
- self._check_for_lock()
if self.version_cap:
self._check_version_cap(msg.get('version'))
@@ -173,7 +159,7 @@ class _CallContext(object):
def _prepare(cls, base,
exchange=_marker, topic=_marker, namespace=_marker,
version=_marker, server=_marker, fanout=_marker,
- timeout=_marker, check_for_lock=_marker, version_cap=_marker):
+ timeout=_marker, version_cap=_marker):
"""Prepare a method invocation context. See RPCClient.prepare()."""
kwargs = dict(
exchange=exchange,
@@ -188,24 +174,21 @@ class _CallContext(object):
if timeout is cls._marker:
timeout = base.timeout
- if check_for_lock is cls._marker:
- check_for_lock = base.check_for_lock
if version_cap is cls._marker:
version_cap = base.version_cap
return _CallContext(base.transport, target,
base.serializer,
- timeout, check_for_lock,
- version_cap)
+ timeout, version_cap)
def prepare(self, exchange=_marker, topic=_marker, namespace=_marker,
version=_marker, server=_marker, fanout=_marker,
- timeout=_marker, check_for_lock=_marker, version_cap=_marker):
+ timeout=_marker, version_cap=_marker):
"""Prepare a method invocation context. See RPCClient.prepare()."""
return self._prepare(self,
exchange, topic, namespace,
version, server, fanout,
- timeout, check_for_lock, version_cap)
+ timeout, version_cap)
class RPCClient(object):
@@ -244,12 +227,12 @@ class RPCClient(object):
cctxt = self._client.prepare(version='2.5')
return cctxt.call(ctxt, 'test', arg=arg)
- RPCClient have a number of other properties - timeout, check_for_lock and
+ RPCClient have a number of other properties - for example, timeout and
version_cap - which may make sense to override for some method invocations,
so they too can be passed to prepare()::
def test(self, ctxt, arg):
- cctxt = self._client.prepare(check_for_lock=None, timeout=10)
+ cctxt = self._client.prepare(timeout=10)
return cctxt.call(ctxt, 'test', arg=arg)
However, this class can be used directly without wrapping it another class.
@@ -265,8 +248,7 @@ class RPCClient(object):
"""
def __init__(self, transport, target,
- timeout=None, check_for_lock=None,
- version_cap=None, serializer=None):
+ timeout=None, version_cap=None, serializer=None):
"""Construct an RPC client.
:param transport: a messaging transport handle
@@ -275,8 +257,6 @@ class RPCClient(object):
:type target: Target
:param timeout: an optional default timeout (in seconds) for call()s
:type timeout: int or float
- :param check_for_lock: a callable that given conf returns held locks
- :type check_for_lock: bool
:param version_cap: raise a RPCVersionCapError version exceeds this cap
:type version_cap: str
:param serializer: an optional entity serializer
@@ -288,7 +268,6 @@ class RPCClient(object):
self.transport = transport
self.target = target
self.timeout = timeout
- self.check_for_lock = check_for_lock
self.version_cap = version_cap
self.serializer = serializer or msg_serializer.NoOpSerializer()
@@ -298,7 +277,7 @@ class RPCClient(object):
def prepare(self, exchange=_marker, topic=_marker, namespace=_marker,
version=_marker, server=_marker, fanout=_marker,
- timeout=_marker, check_for_lock=_marker, version_cap=_marker):
+ timeout=_marker, version_cap=_marker):
"""Prepare a method invocation context.
Use this method to override client properties for an individual method
@@ -322,15 +301,13 @@ class RPCClient(object):
:type fanout: bool
:param timeout: an optional default timeout (in seconds) for call()s
:type timeout: int or float
- :param check_for_lock: a callable that given conf returns held locks
- :type check_for_lock: bool
:param version_cap: raise a RPCVersionCapError version exceeds this cap
:type version_cap: str
"""
return _CallContext._prepare(self,
exchange, topic, namespace,
version, server, fanout,
- timeout, check_for_lock, version_cap)
+ timeout, version_cap)
def cast(self, ctxt, method, **kwargs):
"""Invoke a method and return immediately.
diff --git a/tests/test_rpc_client.py b/tests/test_rpc_client.py
index 194dc57ea..d313e8841 100644
--- a/tests/test_rpc_client.py
+++ b/tests/test_rpc_client.py
@@ -486,54 +486,3 @@ class TestCanSendVersion(test_utils.BaseTestCase):
can_send = client.can_send_version()
self.assertEqual(can_send, self.can_send)
-
-
-class TestCheckForLock(test_utils.BaseTestCase):
-
- scenarios = [
- ('none',
- dict(locks_held=None, warning=None)),
- ('one',
- dict(locks_held=['foo'], warning="held are ['foo']")),
- ('two',
- dict(locks_held=['foo', 'bar'], warning="held are ['foo', 'bar']")),
- ]
-
- def setUp(self):
- super(TestCheckForLock, self).setUp(conf=cfg.ConfigOpts())
- self.conf.register_opts(rpc_client._client_opts)
-
- def test_check_for_lock(self):
- self.config(rpc_response_timeout=None)
-
- transport = _FakeTransport(self.conf)
-
- def check_for_lock(conf):
- self.assertIs(conf, self.conf)
- return self.locks_held
-
- client = messaging.RPCClient(transport, messaging.Target(),
- check_for_lock=check_for_lock)
-
- self.mox.StubOutWithMock(transport, '_send')
- transport._send(messaging.Target(), {},
- dict(method='foo', args={}),
- wait_for_reply=True, timeout=None)
- self.mox.ReplayAll()
-
- warnings = []
-
- def stub_warn(msg, *a, **kw):
- if (a and len(a) == 1 and isinstance(a[0], dict) and a[0]):
- a = a[0]
- warnings.append(msg % a)
-
- self.stubs.Set(rpc_client._LOG, 'warning', stub_warn)
-
- client.call({}, 'foo')
-
- if self.warning:
- self.assertEqual(len(warnings), 1)
- self.assertIn(self.warning, warnings[0])
- else:
- self.assertEqual(len(warnings), 0)