openstack
/
zaqar
Code Issues Proposed changes

Fix claims on non-existing queue on swift 

This returns an empty list instead of an error if we try to claim
messages on a queue that doesn't exist yet.

Change-Id: Ia92774ef1c55a371e37fc845511a5dceb8f92c00
Depends-On: I7e2128f3a5608ed9a41d1e18bd72d771a2a4ddb3
Closes-Bug: #1754061
This commit is contained in:
Thomas Herve 2018-03-12 10:30:24 +01:00
parent 4840509fc7
commit df24b8b023
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zaqar/storage/swift/claims.py
View File

@ -94,7 +94,10 @@ class ClaimController(storage.Claim):
limit=storage.DEFAULT_MESSAGES_PER_CLAIM):
message_ctrl = self.driver.message_controller
queue_ctrl = self.driver.queue_controller
queue_meta = queue_ctrl.get(queue, project=project)
try:
queue_meta = queue_ctrl.get_metadata(queue, project=project)
except errors.QueueDoesNotExist:
return None, iter([])
ttl = metadata['ttl']
grace = metadata['grace']
msg_ts = ttl + grace