summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-02 14:34:25 +0000
committerGerrit Code Review <review@openstack.org>2018-11-02 14:34:25 +0000
commit3bd0c73d9135e7b0b45e1aacd20a539abfa07330 (patch)
tree7b8a08a9e2adf24f77d87c950e918493424a36d3
parentd7a7230ff5273f3f16fce4a37c72e8aadd071563 (diff)
parenta136d5701d6f731574cc87f09bd9526b7a21d993 (diff)
downloadoslo-messaging-3bd0c73d9135e7b0b45e1aacd20a539abfa07330.tar.gz
Merge "Revert "rabbit: Don't prefetch when batch_size is set"" into stable/ocata
-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 b4d9358..f0b5cf1 100644
--- a/oslo_messaging/_drivers/amqpdriver.py
+++ b/oslo_messaging/_drivers/amqpdriver.py
@@ -589,12 +589,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: