From 43ce5981ecbbcfd52aa52306a6cda83d38a69654 Mon Sep 17 00:00:00 2001 From: Zhao Chao Date: Mon, 19 Mar 2018 19:05:44 +0800 Subject: [PATCH] Revert "Fix false-negative failure report for mysqldump backup" The approach merged in I2c10ae7b6b6094af7819594e889385b0ed77fe4b is not a complete solution, mysqldump will dump warning to stderr too which should not break the backup process. A better fix would be doing checks against the stderr logs just like the InnoBackupEx strategy does. See also: https://bugs.launchpad.net/trove/+bug/1756806 This reverts commit 49fea478ee6d2fe67f6c248b8da9b0ce910184f8. Change-Id: Ia8f938619de48b7c0d2efd6753897335a8ebce41 --- trove/guestagent/strategies/backup/mysql_impl.py | 3 ++- trove/tests/unittests/backup/test_backupagent.py | 1 + trove/tests/unittests/guestagent/test_backups.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/trove/guestagent/strategies/backup/mysql_impl.py b/trove/guestagent/strategies/backup/mysql_impl.py index a4843de9bc..8c51fc7a31 100644 --- a/trove/guestagent/strategies/backup/mysql_impl.py +++ b/trove/guestagent/strategies/backup/mysql_impl.py @@ -34,7 +34,8 @@ class MySQLDump(base.BackupRunner): @property def cmd(self): user_and_pass = ( - ' --password=%(password)s -u %(user)s' % + ' --password=%(password)s -u %(user)s ' + '2>/tmp/mysqldump.log' % {'password': MySqlApp.get_auth_password(), 'user': ADMIN_USER_NAME}) cmd = ('mysqldump' diff --git a/trove/tests/unittests/backup/test_backupagent.py b/trove/tests/unittests/backup/test_backupagent.py index 27ad289ab1..6f2526637d 100644 --- a/trove/tests/unittests/backup/test_backupagent.py +++ b/trove/tests/unittests/backup/test_backupagent.py @@ -213,6 +213,7 @@ 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') diff --git a/trove/tests/unittests/guestagent/test_backups.py b/trove/tests/unittests/guestagent/test_backups.py index 7ad9ec4614..aae721f91d 100644 --- a/trove/tests/unittests/guestagent/test_backups.py +++ b/trove/tests/unittests/guestagent/test_backups.py @@ -90,7 +90,8 @@ 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") + "--opt --password=password -u os_admin" + " 2>/tmp/mysqldump.log") SQLDUMP_BACKUP = SQLDUMP_BACKUP_RAW % {'extra_opts': ''} SQLDUMP_BACKUP_EXTRA_OPTS = (SQLDUMP_BACKUP_RAW % {'extra_opts': '--events --routines --triggers'})