mysqldump_args last before pipe

microdevops-com · May 9, 2023 · 6170aaa · 6170aaa
1 parent 082e343
commit 6170aaa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/rsnapshot_backup/rsnapshot_backup.py b/rsnapshot_backup/rsnapshot_backup.py
@@ -654,7 +654,7 @@ def run_cmd_pipe(cmd):
                                                 mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names --batch -e "SHOW DATABASES;" | grep -v -e information_schema -e performance_schema {grep_db_filter} > {mysql_dump_dir}/db_list.txt
                                                 for db in $(cat {mysql_dump_dir}/db_list.txt); do
                                                         if [[ ! -f {mysql_dump_dir}/$db.gz ]]; then
-                                                                {dump_prefix_cmd} mysqldump --defaults-file=/etc/mysql/debian.cnf --force --opt --single-transaction --quick --skip-lock-tables {mysql_events} --databases $db {mysqldump_args} --max_allowed_packet=1G | gzip > {mysql_dump_dir}/$db.gz
+                                                                {dump_prefix_cmd} mysqldump --defaults-file=/etc/mysql/debian.cnf --force --opt --single-transaction --quick --skip-lock-tables {mysql_events} --databases $db --max_allowed_packet=1G {mysqldump_args} | gzip > {mysql_dump_dir}/$db.gz
                                                         fi
                                                 done
                                                 """
@@ -669,7 +669,7 @@ def run_cmd_pipe(cmd):
                                             script_dump_part = textwrap.dedent(
                                                 """\
                                                 if [[ ! -f {mysql_dump_dir}/{source}.gz ]]; then
-                                                        {dump_prefix_cmd} mysqldump --defaults-file=/etc/mysql/debian.cnf --force --opt --single-transaction --quick --skip-lock-tables {mysql_events} --databases {source} {mysqldump_args} --max_allowed_packet=1G | gzip > {mysql_dump_dir}/{source}.gz
+                                                        {dump_prefix_cmd} mysqldump --defaults-file=/etc/mysql/debian.cnf --force --opt --single-transaction --quick --skip-lock-tables {mysql_events} --databases {source} --max_allowed_packet=1G {mysqldump_args} | gzip > {mysql_dump_dir}/{source}.gz
                                                 fi
                                                 """
                                             ).format(