From d7c38ab8625dbc37f3b2d5d22ce55218a1af3bc7 Mon Sep 17 00:00:00 2001 From: kgriffs Date: Wed, 26 Feb 2014 16:32:21 -0600 Subject: [PATCH] fix(mongodb): Limit kwarg must be an int It turns out that the limit kwarg in pymongo's find method doesn't revert to a sensible default when "None" is passed. Change-Id: I9070959cbcc003da49cccce33b28cc3100311f5c --- marconi/queues/storage/mongodb/messages.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/marconi/queues/storage/mongodb/messages.py b/marconi/queues/storage/mongodb/messages.py index c9f5d5dc4..e60c17aa5 100644 --- a/marconi/queues/storage/mongodb/messages.py +++ b/marconi/queues/storage/mongodb/messages.py @@ -287,8 +287,10 @@ class MessageController(storage.Message): query['c.e'] = {'$lte': now} # Construct the request - cursor = collection.find(query, fields=fields, - sort=[('k', sort)], limit=limit) + cursor = collection.find(query, fields=fields, sort=[('k', sort)]) + + if limit is not None: + cursor.limit(limit) # NOTE(flaper87): Suggest the index to use for this query to # ensure the most performant one is chosen.