openstack/zaqar
Code Issues Proposed changes

Merge "fix(mongodb): Remove $or clause used to claim messages"

Browse Source
This commit is contained in:
Jenkins 2013-09-25 08:42:43 +00:00 committed by Gerrit Code Review
commit 8d4acc5f2e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
marconi/queues/storage/mongodb/claims.py
View File

@ -151,15 +151,19 @@ class ClaimController(storage.ClaimBase):
now = timeutils.utcnow_ts()
# Set claim field for messages in ids
# NOTE(kgriffs): Set the claim field for
# the active message batch, while also
# filtering out any messages that happened
# to get claimed just now by one or more
# parallel requests.
#
# Filtering by just 'c.e' works because
# new messages have that field initialized
# to the current time when the message is
# posted. There is no need to check whether
# 'c' exists or 'c.id' is None.
updated = msg_ctrl._col.update({'_id': {'$in': ids},
'$or': [
{'c.id': None},
{
'c.id': {'$ne': None},
'c.e': {'$lte': now}
}
]},
'c.e': {'$lte': now}},
{'$set': {'c': meta}}, upsert=False,
multi=True)['n']