openstack/zaqar
Code Issues Proposed changes

Decouple the queue and subscription

Browse Source 
Now some parts of the subscription storage drivers is assuming
the queue_controller is in the same storage. But unfortunately,
it's not always true. This patch fixes it, but there is no new
test case involved.

Closes-Bug: #1471193

Change-Id: Ic81c928657addd4e0905c3af2b3c8321017559f5
This commit is contained in:
Fei Long Wang 2015-07-27 12:17:19 +12:00
parent 6750a7f70f
commit a909fab7e3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zaqar/storage/mongodb/subscriptions.py
View File

@ -47,8 +47,7 @@ class SubscriptionController(base.Subscription):
def __init__(self, *args, **kwargs):
super(SubscriptionController, self).__init__(*args, **kwargs)
self._collection = self.driver.subscriptions_database.subscriptions
queue_col = self.driver.control_driver.queues_database.queues
self._queue_collection = queue_col
self._queue_ctrl = self.driver.queue_controller
self._collection.ensure_index(SUBSCRIPTIONS_INDEX, unique=True)
@utils.raises_conn_error
@ -95,12 +94,9 @@ class SubscriptionController(base.Subscription):
now = timeutils.utcnow_ts()
ttl = int(ttl)
expires = now + ttl
source_query = {'p_q': utils.scope_queue_name(source, project)}
target_source = self._queue_collection.find_one(
source_query, projection={'m': 1, '_id': 0})
if target_source is None:
raise errors.QueueDoesNotExist(target_source, project)
if not self._queue_ctrl.exists(source, project):
raise errors.QueueDoesNotExist(source, project)
try:
subscription_id = self._collection.insert({'s': source,
'u': subscriber,