From df24b8b0238b019f0c2437a1074b69e19e3d0342 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Mon, 12 Mar 2018 10:30:24 +0100
Subject: [PATCH] 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
---
 zaqar/storage/swift/claims.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zaqar/storage/swift/claims.py b/zaqar/storage/swift/claims.py
index 58060953c..6990880f3 100644
--- a/zaqar/storage/swift/claims.py
+++ b/zaqar/storage/swift/claims.py
@@ -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