Merge "Fix claims on non-existing queue on swift"

This commit is contained in:
Zuul 2018-03-23 08:43:53 +00:00 committed by Gerrit Code Review
commit b2d0c0de35

@ -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