openstack
/
cinder
Code Issues Proposed changes

Merge "Fix db purge for quality_of_service_specs FK constraint"

This commit is contained in:
Jenkins 2016-08-28 19:23:38 +00:00 committed by Gerrit Code Review
parent a33be8f54a b392f8a8f6
commit 8690dedc5d
2 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/db/sqlalchemy/api.py
View File

@ -5520,7 +5520,8 @@ def purge_deleted_rows(context, age_in_days):
# Reorder the list so the volumes and volume_types tables are last
# to avoid FK constraints
for table in ("volume_types", "snapshots", "volumes", "clusters"):
for table in ("volume_types", "quality_of_service_specs",
"snapshots", "volumes", "clusters"):
tables.remove(table)
tables.append(table)
@ -5532,6 +5533,14 @@ def purge_deleted_rows(context, age_in_days):
deleted_age = timeutils.utcnow() - dt.timedelta(days=age_in_days)
try:
with session.begin():
# Delete child records first from quality_of_service_specs
# table to avoid FK constraints
if table == "quality_of_service_specs":
session.query(models.QualityOfServiceSpecs).filter(
and_(models.QualityOfServiceSpecs.specs_id.isnot(
None), models.QualityOfServiceSpecs.deleted == 1,
models.QualityOfServiceSpecs.deleted_at <
deleted_age)).delete()
result = session.execute(
t.delete()
.where(t.c.deleted_at < deleted_age))

52
cinder/tests/unit/db/test_purge.py
View File

@ -60,6 +60,9 @@ class PurgeDeletedTest(test.TestCase):
self.vgm = sqlalchemyutils.get_table(
self.engine, "volume_glance_metadata")
self.qos = sqlalchemyutils.get_table(
self.engine, "quality_of_service_specs")
self.uuidstrs = []
for unused in range(6):
self.uuidstrs.append(uuid.uuid4().hex)
@ -89,6 +92,19 @@ class PurgeDeletedTest(test.TestCase):
snapshot_id=uuidstr, key='image_name', value='test')
self.conn.execute(ins_stmt)
ins_stmt = self.qos.insert().values(
id=uuidstr, key='QoS_Specs_Name', value='test')
self.conn.execute(ins_stmt)
ins_stmt = self.vol_types.insert().values(
id=uuid.uuid4().hex, qos_specs_id=uuidstr)
self.conn.execute(ins_stmt)
ins_stmt = self.qos.insert().values(
id=uuid.uuid4().hex, specs_id=uuidstr, key='desc',
value='test')
self.conn.execute(ins_stmt)
# Set 4 of them deleted, 2 are 60 days ago, 2 are 20 days ago
old = timeutils.utcnow() - datetime.timedelta(days=20)
older = timeutils.utcnow() - datetime.timedelta(days=60)
@ -145,6 +161,25 @@ class PurgeDeletedTest(test.TestCase):
where(self.vgm.c.snapshot_id.in_(self.uuidstrs[4:6]))\
.values(deleted_at=older)
make_qos_old = self.qos.update().where(
self.qos.c.id.in_(self.uuidstrs[1:3])).values(deleted_at=old)
make_qos_older = self.qos.update().where(
self.qos.c.id.in_(self.uuidstrs[4:6])).values(deleted_at=older)
make_qos_child_record_old = self.qos.update().where(
self.qos.c.specs_id.in_(self.uuidstrs[1:3])).values(
deleted_at=old)
make_qos_child_record_older = self.qos.update().where(
self.qos.c.specs_id.in_(self.uuidstrs[4:6])).values(
deleted_at=older)
make_vol_types1_old = self.vol_types.update().where(
self.vol_types.c.qos_specs_id.in_(self.uuidstrs[1:3])).values(
deleted_at=old)
make_vol_types1_older = self.vol_types.update().where(
self.vol_types.c.qos_specs_id.in_(self.uuidstrs[4:6])).values(
deleted_at=older)
self.conn.execute(make_vol_old)
self.conn.execute(make_vol_older)
self.conn.execute(make_vol_meta_old)
@ -165,6 +200,15 @@ class PurgeDeletedTest(test.TestCase):
self.conn.execute(make_snap_glance_meta_old)
self.conn.execute(make_snap_glance_meta_older)
self.conn.execute(make_qos_old)
self.conn.execute(make_qos_older)
self.conn.execute(make_qos_child_record_old)
self.conn.execute(make_qos_child_record_older)
self.conn.execute(make_vol_types1_old)
self.conn.execute(make_vol_types1_older)
def test_purge_deleted_rows_old(self):
dialect = self.engine.url.get_dialect()
if dialect == sqlite.dialect:
@ -186,15 +230,17 @@ class PurgeDeletedTest(test.TestCase):
snap_rows = self.session.query(self.snapshots).count()
snap_meta_rows = self.session.query(self.sm).count()
vol_glance_meta_rows = self.session.query(self.vgm).count()
qos_rows = self.session.query(self.qos).count()
# Verify that we only deleted 2
self.assertEqual(4, vol_rows)
self.assertEqual(4, vol_meta_rows)
self.assertEqual(4, vol_type_rows)
self.assertEqual(8, vol_type_rows)
self.assertEqual(4, vol_type_proj_rows)
self.assertEqual(4, snap_rows)
self.assertEqual(4, snap_meta_rows)
self.assertEqual(8, vol_glance_meta_rows)
self.assertEqual(8, qos_rows)
def test_purge_deleted_rows_older(self):
dialect = self.engine.url.get_dialect()
@ -217,15 +263,17 @@ class PurgeDeletedTest(test.TestCase):
snap_rows = self.session.query(self.snapshots).count()
snap_meta_rows = self.session.query(self.sm).count()
vol_glance_meta_rows = self.session.query(self.vgm).count()
qos_rows = self.session.query(self.qos).count()
# Verify that we only have 2 rows now
self.assertEqual(2, vol_rows)
self.assertEqual(2, vol_meta_rows)
self.assertEqual(2, vol_type_rows)
self.assertEqual(4, vol_type_rows)
self.assertEqual(2, vol_type_proj_rows)
self.assertEqual(2, snap_rows)
self.assertEqual(2, snap_meta_rows)
self.assertEqual(4, vol_glance_meta_rows)
self.assertEqual(4, qos_rows)
def test_purge_deleted_rows_bad_args(self):
# Test with no age argument