openstack/placement
Code Issues Proposed changes

Merge "Make nova-manage db purge take --all-cells"

Browse Source
This commit is contained in:
Zuul 2018-03-08 22:49:01 +00:00 committed by Gerrit Code Review
commit 5eb1ece537
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gate/post_test_hook.sh
View File

@ -19,7 +19,7 @@ function archive_deleted_rows {
} }
function purge_db { function purge_db {
$MANAGE $* db purge --all --verbose $MANAGE db purge --all --verbose --all-cells
RET=$? RET=$?
if [[ $RET -eq 0 ]]; then if [[ $RET -eq 0 ]]; then
echo Purge successful echo Purge successful
@ -40,7 +40,7 @@ cell_conf=$(conductor_conf 1)
conf="--config-file $NOVA_CONF --config-file $cell_conf" conf="--config-file $NOVA_CONF --config-file $cell_conf"
archive_deleted_rows $conf archive_deleted_rows $conf
purge_db $conf purge_db
set -e set -e
# We need to get the admin credentials to run the OSC CLIs for Placement. # We need to get the admin credentials to run the OSC CLIs for Placement.

4
nova/db/sqlalchemy/api.py
View File

@ -5926,8 +5926,8 @@ def _purgeable_tables(metadata):
t.name.endswith('migrate_version'))] t.name.endswith('migrate_version'))]
def purge_shadow_tables(before_date, status_fn=None): def purge_shadow_tables(context, before_date, status_fn=None):
engine = get_engine() engine = get_engine(context=context)
conn = engine.connect() conn = engine.connect()
metadata = MetaData() metadata = MetaData()
metadata.bind = engine metadata.bind = engine