openstack/devstack
Code Issues Proposed changes

Specialize Zaqar's cleanup function

Browse Source 
Instead of having mongodb specific cleanup logic in `cleanup_zaqar`,
specialize it to perform clean ups based on the driver that has been
enabled.

Change-Id: I5807a83443b87b2c8d184e0cd2d5563a649c6273
This commit is contained in:
Flavio Percoco
2014-09-08 09:48:27 +02:00
parent d38675cd9e
commit dec13c336d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/zaqar
View File

@@ -20,6 +20,7 @@
# start_zaqar # start_zaqar
# stop_zaqar # stop_zaqar
# cleanup_zaqar # cleanup_zaqar
# cleanup_zaqar_mongodb
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) XTRACE=$(set +o | grep xtrace)
@@ -72,9 +73,17 @@ function is_zaqar_enabled {
return 1 return 1
} }
# cleanup_zaqar() - Remove residual data files, anything left over from previous # cleanup_zaqar() - Cleans up general things from previous
# runs that a clean run would need to clean up # runs and storage specific left overs.
function cleanup_zaqar { function cleanup_zaqar {
if [ "$ZAQAR_BACKEND" = 'mongodb' ] ; then
cleanup_zaqar_mongodb
fi
}
# cleanup_zaqar_mongodb() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_zaqar_mongodb {
if ! timeout $SERVICE_TIMEOUT sh -c "while ! mongo zaqar --eval 'db.dropDatabase();'; do sleep 1; done"; then if ! timeout $SERVICE_TIMEOUT sh -c "while ! mongo zaqar --eval 'db.dropDatabase();'; do sleep 1; done"; then
die $LINENO "Mongo DB did not start" die $LINENO "Mongo DB did not start"
else else
@@ -116,8 +125,9 @@ function configure_zaqar {
iniset $ZAQAR_CONF drivers storage mongodb iniset $ZAQAR_CONF drivers storage mongodb
iniset $ZAQAR_CONF 'drivers:storage:mongodb' uri mongodb://localhost:27017/zaqar iniset $ZAQAR_CONF 'drivers:storage:mongodb' uri mongodb://localhost:27017/zaqar
configure_mongodb configure_mongodb
cleanup_zaqar
fi fi
cleanup_zaqar
} }
function configure_mongodb { function configure_mongodb {