openstack/zaqar
Code Issues Proposed changes

Merge "fix(storage.mongodb): Race condition when creating a claim"

Browse Source
This commit is contained in:
Jenkins 2013-09-06 14:44:08 +00:00 committed by Gerrit Code Review
commit f681cc1a9d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
marconi/storage/mongodb/claims.py
View File

@ -180,6 +180,12 @@ class ClaimController(storage.ClaimBase):
upsert=False, multi=True)
if updated != 0:
# NOTE(kgriffs): This extra step is necessary because
# in between having gotten a list of active messages
# and updating them, some of them may have been
# claimed by a parallel request. Therefore, we need
# to find out which messages were actually tagged
# with the claim ID successfully.
claim, messages = self.get(queue, oid, project=project)
return (str(oid), messages)

8
marconi/storage/mongodb/messages.py
View File

@ -25,6 +25,7 @@ import datetime
import time
import pymongo.errors
import pymongo.read_preferences
from marconi.common import config
import marconi.openstack.common.log as logging
@ -343,7 +344,12 @@ class MessageController(storage.MessageBase):
'p': project,
}
msgs = self._col.find(query, sort=[('k', 1)])
# NOTE(kgriffs): Claimed messages bust be queried from
# the primary to avoid a race condition caused by the
# multi-phased "create claim" algorithm.
preference = pymongo.read_preferences.ReadPreference.PRIMARY
msgs = self._col.find(query, sort=[('k', 1)],
read_preference=preference)
if limit:
msgs = msgs.limit(limit)