summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-19 22:04:29 +0000
committerGerrit Code Review <review@openstack.org>2018-06-19 22:04:29 +0000
commiteea496b2ec8ba87c8519a79fdb3311e25e833422 (patch)
treeb1e447e7474f50a4d2ccd8cb65607a13701c69bb
parent7ccdd773865724fbed8e0955ecc4b077fffa043b (diff)
parentb996206512c051ea8b61b845f84fa989b4ac2ada (diff)
downloadoslo-messaging-eea496b2ec8ba87c8519a79fdb3311e25e833422.tar.gz
Merge "Revert "rabbit: Don't prefetch when batch_size is set"" into stable/queens5.35.1
-rw-r--r--oslo_messaging/_drivers/amqpdriver.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/oslo_messaging/_drivers/amqpdriver.py b/oslo_messaging/_drivers/amqpdriver.py
index deeaba2..8fc72db 100644
--- a/oslo_messaging/_drivers/amqpdriver.py
+++ b/oslo_messaging/_drivers/amqpdriver.py
@@ -582,12 +582,6 @@ class AMQPDriverBase(base.BaseDriver):
def listen_for_notifications(self, targets_and_priorities, pool,
batch_size, batch_timeout):
conn = self._get_connection(rpc_common.PURPOSE_LISTEN)
- # NOTE(sileht): The application set batch_size, so we don't need to
- # prefetch more messages, especially for notifications. Notifications
- # queues can be really big when the consumer have disapear during a
- # long period, and when it come back, kombu/pyamqp will fetch all
- # messages it can. So we override the default qos prefetch value
- conn.connection.rabbit_qos_prefetch_count = batch_size
listener = AMQPListener(self, conn)
for target, priority in targets_and_priorities: