openstack/zaqar
Code Issues Proposed changes

Don't raise DoesNotExist on claims deletion

Browse Source 
We don't raise DoesNotExist when the queue that a claim has to be
deleted from does not exist.

Implements blueprint: sql-storage-driver

Change-Id: I2a3e11d493b066c5dae7af81db81989468e90726
This commit is contained in:
Flavio Percoco 2014-02-26 11:18:39 +01:00
parent 254ab064e8
commit bbcd593a74
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
marconi/queues/storage/sqlalchemy/claims.py
View File

@ -165,7 +165,13 @@ class ClaimController(storage.Claim):
return return
with self.driver.trans() as trans: with self.driver.trans() as trans:
qid = utils.get_qid(self.driver, queue, project) try:
# NOTE(flaper87): This could probably use some
# joins and be just 1 query.
qid = utils.get_qid(self.driver, queue, project)
except errors.QueueDoesNotExist:
return
and_stmt = sa.and_(tables.Claims.c.id == cid, and_stmt = sa.and_(tables.Claims.c.id == cid,
tables.Claims.c.qid == qid) tables.Claims.c.qid == qid)
dlt = tables.Claims.delete().where(and_stmt) dlt = tables.Claims.delete().where(and_stmt)