xtrabackup additional-options not passed to prepare

[MikeG]

Problem:

additional-options specification in xtrabackup backupset configuration are not passed to the prepare phase when apply-logs=yes and stream=no

How to reproduce:

[root@host ~]# holland mc xtrabackup -f /etc/holland/backupsets/xtrabackup_dist.conf
Holland 1.0.10 started with pid 29594
Saving config to '/etc/holland/backupsets/xtrabackup_dist.conf'

[root@host ~]# diff -u /etc/holland/backupsets/xtrabackup_dist.conf /etc/holland/backupsets/xtrabackup.conf
--- /etc/holland/backupsets/xtrabackup_dist.conf 2013-08-24 05:13:31.000000000 +0000
+++ /etc/holland/backupsets/xtrabackup.conf 2013-08-24 05:11:23.000000000 +0000
@@ -9,13 +9,13 @@
 global-defaults = /etc/my.cnf
 innobackupex = innobackupex-1.5.1
 # ibbackup = "" # no default
-stream = tar
+stream = no
 apply-logs = yes
 slave-info = no
 safe-slave-backup = no
 no-lock = no
 # tmpdir = "" # no default
-additional-options = ,
+additional-options = --use-mem=123M
 # pre-command = "" # no default

 [compression]

[root@host ~]# cat /dev/null > /var/log/holland/holland.log
[root@host ~]# holland -q bk xtrabackup
[root@host ~]# echo $?
0
[root@host ~]# grep innobackupex /var/log/holland/holland.log
2013-08-24 05:17:16,067 [INFO] Executing: /usr/bin/innobackupex-1.5.1 --defaults-file=/var/spool/holland/xtrabackup/20130824_051716/my.cnf --tmpdir=/var/spool/holland/xtrabackup/20130824_051716 --no-timestamp --use-mem=123M /var/spool/holland/xtrabackup/20130824_051716/data
2013-08-24 05:17:41,844 [INFO] Executing: /usr/bin/innobackupex-1.5.1 --apply-log /var/spool/holland/xtrabackup/20130824_051716/data
2013-08-24 05:17:52,532 [INFO] At the end of a successful apply-log run innobackupex-1.5.1
2013-08-24 05:17:52,532 [INFO] 130824 05:17:42 innobackupex-1.5.1: Starting ibbackup with command: xtrabackup_55 --defaults-file="/var/spool/holland/xtrabackup/20130824_051716/data/backup-my.cnf" --prepare --target-dir=/var/spool/holland/xtrabackup/20130824_051716/data
2013-08-24 05:17:52,539 [INFO] 130824 05:17:47 innobackupex-1.5.1: Restarting xtrabackup with command: xtrabackup_55 --defaults-file="/var/spool/holland/xtrabackup/20130824_051716/data/backup-my.cnf" --prepare --target-dir=/var/spool/holland/xtrabackup/20130824_051716/data
2013-08-24 05:17:52,546 [INFO] 130824 05:17:52 innobackupex-1.5.1: completed OK!

Expected:

2013-08-24 05:17:52,532 [INFO] 130824 05:17:42 innobackupex-1.5.1: Starting ibbackup with command: xtrabackup_55 --defaults-file="/var/spool/holland/xtrabackup/20130824_051716/data/backup-my.cnf" --prepare --target-dir=/var/spool/holland/xtrabackup/20130824_051716/data --use-memory=123M

[Andrew Garner (muzazzi)]

There definitely should be a way to adjust options to --apply-logs. However, I don't think it makes sense to pass the same "additional-options" unconditionally to both the innobackupex backup and apply-logs phases.

Perhaps we should just have, as a default:

prepare-command = "innobackupex --apply-logs ${target_directory}"

And that can be customized as needed. This allows adjusting the command to use --apply-logs-only and/or adding any set of other parameters some of which may not be easily anticipated today.