openstack/zaqar
Code Issues Proposed changes

Merge "fix: Claim can return 404"

Browse Source
This commit is contained in:
Jenkins 2013-09-05 12:13:29 +00:00 committed by Gerrit Code Review
commit 380e33c223
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,6 @@ class ClaimController(storage.ClaimBase):
""" """
msg_ctrl = self.driver.message_controller msg_ctrl = self.driver.message_controller
if not self.driver.queue_controller.exists(queue, project):
raise exceptions.QueueDoesNotExist(queue, project)
ttl = metadata['ttl'] ttl = metadata['ttl']
grace = metadata['grace'] grace = metadata['grace']
oid = objectid.ObjectId() oid = objectid.ObjectId()
@ -148,7 +145,7 @@ class ClaimController(storage.ClaimBase):
ids = [msg['_id'] for msg in msgs] ids = [msg['_id'] for msg in msgs]
if len(ids) == 0: if len(ids) == 0:
return (str(oid), messages) return (None, messages)
now = timeutils.utcnow() now = timeutils.utcnow()

5
marconi/storage/sqlite/claims.py
View File

@ -78,7 +78,10 @@ class ClaimController(base.ClaimBase):
project = '' project = ''
with self.driver('immediate'): with self.driver('immediate'):
qid = utils.get_qid(self.driver, queue, project) try:
qid = utils.get_qid(self.driver, queue, project)
except exceptions.QueueDoesNotExist:
return None, iter([])
# Clean up all expired claims in this queue # Clean up all expired claims in this queue

2
marconi/tests/transport/wsgi/test_claims.py
View File

@ -205,7 +205,7 @@ class ClaimsBaseTest(base.TestBase):
def test_nonexistent(self): def test_nonexistent(self):
self.simulate_post('/v1/queues/nonexistent/claims', self.project_id, self.simulate_post('/v1/queues/nonexistent/claims', self.project_id,
body='{"ttl": 100, "grace": 60}') body='{"ttl": 100, "grace": 60}')
self.assertEquals(self.srmock.status, falcon.HTTP_404) self.assertEquals(self.srmock.status, falcon.HTTP_204)
# NOTE(cpp-cabrera): regression test against bug #1203842 # NOTE(cpp-cabrera): regression test against bug #1203842
def test_get_nonexistent_claim_404s(self): def test_get_nonexistent_claim_404s(self):

3
marconi/transport/wsgi/claims.py
View File

@ -76,9 +76,6 @@ class CollectionResource(object):
except input_exceptions.ValidationFailed as ex: except input_exceptions.ValidationFailed as ex:
raise wsgi_exceptions.HTTPBadRequestBody(str(ex)) raise wsgi_exceptions.HTTPBadRequestBody(str(ex))
except storage_exceptions.DoesNotExist:
raise falcon.HTTPNotFound()
except Exception as ex: except Exception as ex:
LOG.exception(ex) LOG.exception(ex)
description = _(u'Claim could not be created.') description = _(u'Claim could not be created.')