openstack/trove
Code Issues Proposed changes

Fix false-negative failure report for mysqldump backup

Browse Source 
If mysqldump command has redirect part for stderr, catching error logic
by stderr doest not work as expected. Remove redirect part to report
BackupError normally for sqldump failure.

Change-Id: I2c10ae7b6b6094af7819594e889385b0ed77fe4b
Close-Bug: 1753498
This commit is contained in:
Yang Youseok 2018-03-05 23:16:33 +09:00
parent f71719a0f3
commit 49fea478ee
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trove/guestagent/strategies/backup/mysql_impl.py
View File

@ -34,8 +34,7 @@ class MySQLDump(base.BackupRunner):
@property
def cmd(self):
user_and_pass = (
' --password=%(password)s -u %(user)s '
'2>/tmp/mysqldump.log' %
' --password=%(password)s -u %(user)s' %
{'password': MySqlApp.get_auth_password(),
'user': ADMIN_USER_NAME})
cmd = ('mysqldump'

1
trove/tests/unittests/backup/test_backupagent.py
View File

@ -213,7 +213,6 @@ class BackupAgentTest(trove_testtools.TestCase):
' --opt'
' --password=123'
' -u os_admin'
' 2>/tmp/mysqldump.log'
' | gzip |'
' openssl enc -aes-256-cbc -salt '
'-pass pass:default_aes_cbc_key')

3
trove/tests/unittests/guestagent/test_backups.py
View File

@ -90,8 +90,7 @@ XTRA_BACKUP_INCR = ('sudo innobackupex --stream=xbstream'
' /var/lib/mysql/data'
' 2>/tmp/innobackupex.log')
SQLDUMP_BACKUP_RAW = ("mysqldump --all-databases %(extra_opts)s "
"--opt --password=password -u os_admin"
" 2>/tmp/mysqldump.log")
"--opt --password=password -u os_admin")
SQLDUMP_BACKUP = SQLDUMP_BACKUP_RAW % {'extra_opts': ''}
SQLDUMP_BACKUP_EXTRA_OPTS = (SQLDUMP_BACKUP_RAW %
{'extra_opts': '--events --routines --triggers'})