summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2013-03-22 13:59:14 -0400
committerRussell Bryant <rbryant@redhat.com>2013-03-22 14:03:51 -0400
commit132a0c1fd1eb127e393e5794ffa6d4a3a4950567 (patch)
tree13da3654b3282a15adb7e17f27d6a4acd11ab09b /nova/openstack
parenta92b7c8f9281cb2dcf8eb6d6a7c466a463719352 (diff)
downloadnova-132a0c1fd1eb127e393e5794ffa6d4a3a4950567.tar.gz
nova-132a0c1fd1eb127e393e5794ffa6d4a3a4950567.tar.xz
nova-132a0c1fd1eb127e393e5794ffa6d4a3a4950567.zip
Don't log traceback on rpc timeout.
Don't log a traceback in the rpc layer after a timeout() occurs while waiting on a response to a call(). Let the caller get the exception and decide whether it should be logged or not. Fix bug 1158920. Change-Id: I0387ab48899627cbc3eb1d7187067472ddefc1bf
Diffstat (limited to 'nova/openstack')
-rw-r--r--nova/openstack/common/rpc/amqp.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/openstack/common/rpc/amqp.py b/nova/openstack/common/rpc/amqp.py
index c23e36ec8..cc0098cc3 100644
--- a/nova/openstack/common/rpc/amqp.py
+++ b/nova/openstack/common/rpc/amqp.py
@@ -495,7 +495,6 @@ class MulticallProxyWaiter(object):
data = self._dataqueue.get(timeout=self._timeout)
result = self._process_data(data)
except queue.Empty:
- LOG.exception(_('Timed out waiting for RPC response.'))
self.done()
raise rpc_common.Timeout()
except Exception: