openstack/zaqar
Code Issues Proposed changes

Merge "fix(mongo): Delete claimed message fails"

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

9
marconi/queues/storage/mongodb/messages.py
View File

@ -646,7 +646,14 @@ class MessageController(storage.MessageBase):
else:
if message['c']['id'] != cid:
raise errors.MessageIsClaimedBy(message_id, claim)
# NOTE(kgriffs): Read from primary in case the message
# was just barely claimed, and claim hasn't made it to
# the secondary.
pref = pymongo.read_preferences.ReadPreference.PRIMARY
message = collection.find_one(query, read_preference=pref)
if message['c']['id'] != cid:
raise errors.MessageIsClaimedBy(message_id, claim)
collection.remove(query['_id'], w=0)