From e72599435c59c09277a9da7686b32aa4f9df7ba4 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Wed, 9 Dec 2015 18:49:19 +0100
Subject: [PATCH] Don't trigger error_callback for known exc
When AMQPDestinationNotFound is raised, we must not
call the error_callback method. The exception is logged
only if needed in upper layer (amqpdriver.py).
Related-bug: #1524418
Change-Id: Ic1ddec2d13172532dbaa572d04a4c22c97ac4fe7
---
oslo_messaging/_drivers/impl_rabbit.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index b9ff36353..f8b4aea7c 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -700,6 +700,10 @@ class Connection(object):
'tries: %(err_str)s') % info
LOG.error(msg)
raise exceptions.MessageDeliveryFailure(msg)
+ except rpc_amqp.AMQPDestinationNotFound:
+ # NOTE(sileht): we must reraise this without
+ # trigger error_callback
+ raise
except Exception as exc:
error_callback and error_callback(exc)
raise