Merge lp:~vlad-lesin/percona-xtrabackup/2.2-bug-1227240 into lp:percona-xtrabackup/2.2

[Vlad Lesin]

Bug #1227240 fix.

my.cnf can contain innodb_log_arch_dir option for server. xtrabackup can
use servers my.cnf. As innodb_log_arch_dir option can be used only for backup
preparing xtrabackup exits with error message in the case of backup with
innodb_log_arch_dir option. Such behavior does not allow to make backup if
default my.cnf contains innodb_log_arch_dir.

This fix ignores --innodb_log_arch_dir and --to-archived-lsn and outputs warning
if --prepare is not set.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/16/

[Alexey Kopytov (akopytov)]

Same comments as in 2.1.

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> Same comments as in 2.1.

Fixed.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/31/

[Alexey Kopytov (akopytov)]

Same question as in 2.1.

review: Needs Fixing

[lp:~vlad-lesin/percona-xtrabackup/2.2-bug-1227240]

4886. By Vlad Lesin on 2013-11-13

Bug #1227240 fix.

my.cnf can contain innodb_log_arch_dir option for server. xtrabackup can
use servers my.cnf. As innodb_log_arch_dir option can be used only for backup
preparing xtrabackup exits with error message in the case of backup with
innodb_log_arch_dir option. Such behavior does not allow to make backup if
default my.cnf contains innodb_log_arch_dir.

This fix ignores --innodb_log_arch_dir and --to-archived-lsn and outputs warning
if --prepare is not set.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'xtrabackup/src/xtrabackup.cc'
--- xtrabackup/src/xtrabackup.cc	2013-11-12 08:56:58 +0000
+++ xtrabackup/src/xtrabackup.cc	2013-11-13 23:52:34 +0000
@@ -5993,10 +5993,15 @@
 
         if (!xtrabackup_prepare &&
             (innobase_log_arch_dir || xtrabackup_archived_to_lsn)) {
-		msg("xtrabackup: error: "
-		    "--archived-logs-dir and --to-archived-lsn can be used "
-		    "only with --prepare\n");
-		exit(EXIT_FAILURE);
+		/*
+		  Default my.cnf can contain innobase_log_arch_dir option set for server,
+                  reset it to allow backup.
+		*/
+		innobase_log_arch_dir= NULL;
+		xtrabackup_archived_to_lsn= 0;
+		msg("xtrabackup: warning: "
+		    "as --innodb-log-arch-dir and --to-archived-lsn can be used "
+		    "only with --prepare they will be reset\n");
         }
 
 	/* cannot execute both for now */

=== added file 'xtrabackup/test/t/xb_bug_1227240.sh'
--- xtrabackup/test/t/xb_bug_1227240.sh	1970-01-01 00:00:00 +0000
+++ xtrabackup/test/t/xb_bug_1227240.sh	2013-11-13 23:52:34 +0000
@@ -0,0 +1,39 @@
+. inc/common.sh
+# If server config file contains innodb-log-arch-dir option
+# then "xtrabackup --backup" fails as it reads this option
+# from server config file and it was supposed innodb-log-arch-dir
+# option can be used only with --prepare for xtrabackup.
+# Currently this limitation is removed and only warning outputs
+# when attempt of using innodb-log-arch-dir without --prepare
+# takes place.
+
+require_xtradb
+# The xtrabackup build and binary names are choosen automatically
+# corresponding to server version except the case when
+# build name is set explicitly with certain command line option.
+# If such option is not used the below string not only checks the
+# server version but if the check passed this means that the
+# required xtrabackup build name is set.
+require_server_version_higher_than '5.6.10'
+
+init_server_variables 1
+switch_server 1
+ARCH_LOG_DIR=$MYSQLD_VARDIR/arch_log
+BACKUP_DIR=$MYSQLD_VARDIR/backup
+reset_server_variables 1
+
+MYSQLD_EXTRA_MY_CNF_OPTS="innodb-log-archive=ON
+			  innodb-log-arch-dir=$ARCH_LOG_DIR"
+mkdir -p $ARCH_LOG_DIR $BACKUP_DIR
+
+start_server
+# If xtrabackup finished whithout error the test passed.
+xtrabackup --backup --datadir=$MYSQLD_DATADIR --target-dir=$BACKUP_DIR
+stop_server
+
+rm -rf $ARCH_LOG_DIR $BACKUP_DIR
+
+unset ARCH_LOG_DIR
+unset BACKUP_DIR
+
+exit 0