x
/
osops-tools-generic
Code Issues Proposed changes

Avoid passing backslashes in SQL snippets 

In order to fix bug #1534660, change 269530 splits many overly long
lines in Bash scripts using backslash continuations.  But in some
cases, these backslashes were inserted within command arguments that
are interpreted as SQL expressions, where they cause syntax errors.

This changes splits the corresponding lines differently, so that the
backslashes are no longer passed in SQL expressions.

Change-Id: I4a8940b6fe9ce8563315cd0cc9a9529a02f8cdb8
Closes-Bug: 1596193
Related-Bug: 1534660
This commit is contained in:
Simon Leinen 2016-06-25 16:31:05 +02:00
parent 6492a37e76
commit df055acc61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/openstack_db_archive.sh
View File

@ -101,14 +101,14 @@ echo `date` "Purging nova.instance_actions_events of deleted instance data"
TABLE=instance_actions_events
SHADOW_TABLE="shadow_${TABLE}"
pt-archiver ${DRY_RUN} ${NOSAI} --statistics --sleep-coef 0.75 --progress 100 \
--commit-each --limit 10 \
pt-archiver ${DRY_RUN} ${NOSAI} --statistics --sleep-coef 0.75 \
--progress 100 --commit-each --limit 10 \
--source D=${DATABASE},t=${TABLE}${HOSTPT}${USERPT}${PASSPT} \
--no-check-charset \
--dest D=${DATABASE},t=${SHADOW_TABLE}${HOSTPT}${USERPT}${PASSPT} \
--where 'EXISTS(SELECT * FROM instance_actions, instances WHERE \
instance_actions.id=instance_actions_events.action_id AND \
instance_actions.instance_uuid=instances.uuid AND instances.deleted!=0)'
--where 'EXISTS(SELECT * FROM instance_actions, instances WHERE '\
'instance_actions.id=instance_actions_events.action_id AND '\
'instance_actions.instance_uuid=instances.uuid AND instances.deleted!=0)'
for TABLE in ${FKTABLES}; do
echo `date` "Purging nova.${TABLE} of deleted instance data"
@ -126,8 +126,8 @@ for TABLE in ${FKTABLES}; do
--source D=${DATABASE},t=${TABLE}${HOSTPT}${USERPT}${PASSPT} \
--no-check-charset \
--dest D=${DATABASE},t=${SHADOW_TABLE}${HOSTPT}${USERPT}${PASSPT} \
--where 'EXISTS(SELECT * FROM instances WHERE deleted!=0 AND \
uuid='${TABLE}'.instance_uuid)'
--where 'EXISTS(SELECT * FROM instances WHERE deleted!=0 '\
'AND uuid='${TABLE}'.instance_uuid)'
done
for TABLE in ${TABLES}; do