Merge "db purge: raise on missing tables"
This commit is contained in:
@@ -6450,6 +6450,11 @@ def purge_deleted_records(context, age_in_days):
|
||||
|
||||
metadata = MetaData()
|
||||
metadata.reflect(get_engine())
|
||||
tables = metadata.sorted_tables
|
||||
if not tables:
|
||||
msg = 'No tables found, check database connection'
|
||||
raise exception.InvalidResults(msg)
|
||||
|
||||
deleted_age = timeutils.utcnow() - datetime.timedelta(days=age_in_days)
|
||||
|
||||
# Deleting rows in share_network_security_service_association
|
||||
@@ -6464,7 +6469,7 @@ def purge_deleted_records(context, age_in_days):
|
||||
with context.session.begin_nested():
|
||||
context.session.delete(assoc)
|
||||
|
||||
for table in reversed(metadata.sorted_tables):
|
||||
for table in reversed(tables):
|
||||
if 'deleted' not in table.columns.keys():
|
||||
continue
|
||||
|
||||
|
@@ -0,0 +1,6 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Purge DB records is fixed to raise error in case of missing or invalid
|
||||
db config. For more details, please check
|
||||
`launchpad bug #2124043 <https://bugs.launchpad.net/manila/+bug/2124043>`_
|
Reference in New Issue
Block a user