Merge lp:~sergei.glushchenko/percona-xtrabackup/BT31424-2.0-xb-bug1174314 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Bug 1174314: Make xtrabackup --stats work with server datadir
xtrabackup --stats made checks whether log files are created or not.
It always considered that log files are stored in data directory.
Solution is to modify check to use innodb_log_group_home_dir value.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/429/

[Alexey Kopytov (akopytov)]

No testcase?

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Indeed, I forgot to put it under version control. Branch is updated. Starting Jenkins job.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/433/

innodb56 debug failures are because of https://bugs.launchpad.net/percona-xtrabackup/+bug/1175566

[Alexey Kopytov (akopytov)]

review: Approve

[Sergei Glushchenko (sergei.glushchenko)]

Repushed tree because trap statement in test case has been commented out for debug purposes.
I uncommented it.

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-04-29 05:45:52 +0000
+++ src/xtrabackup.cc	2013-05-02 13:11:26 +0000
@@ -6118,7 +6118,11 @@
 		ibool		exists;
 		os_file_type_t	type;
 
-		sprintf(logname, "ib_logfile%lu", (ulong) n);
+		snprintf(logname, sizeof(logname), "%s%c%s%lu",
+			INNODB_LOG_DIR, SRV_PATH_SEPARATOR,
+			"ib_logfile", (ulong) n);
+		srv_normalize_path_for_win(logname);
+
 		if (!os_file_status(logname, &exists, &type) || !exists ||
 		    type != OS_FILE_TYPE_FILE) {
 			msg("xtrabackup: Error: "

=== modified file 'test/t/xb_stats.sh'
--- test/t/xb_stats.sh	2012-10-15 16:14:59 +0000
+++ test/t/xb_stats.sh	2013-05-02 13:11:26 +0000
@@ -17,7 +17,7 @@
 vlog "===> xtrabackup --stats --datadir=$topdir/backup"
 run_cmd_expect_failure $XB_BIN $XB_ARGS --stats --datadir=$topdir/backup
 
-if ! grep -q "Cannot find log file ib_logfile0" $OUTFILE
+if ! grep -q "Cannot find log file" $OUTFILE
 then
     die "Cannot find the expected error message from xtrabackup --stats"
 fi

=== added file 'test/t/xb_stats_datadir.sh'
--- test/t/xb_stats_datadir.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_stats_datadir.sh	2013-05-02 13:11:26 +0000
@@ -0,0 +1,33 @@
+################################################################################
+# Bug #1174314
+# Test xtrabackup --stats with server dir
+################################################################################
+
+. inc/common.sh
+
+mkdir ${TEST_BASEDIR}/logs
+
+trap "rm -rf ${TEST_BASEDIR}/logs" INT TERM EXIT
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_log_group_home_dir=${TEST_BASEDIR}/logs
+"
+
+start_server
+
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+EOF
+
+shutdown_server
+
+# there is inconsistency between shutdown_server and stop_server
+# stop_server sets XB_ARGS="--no-defaults", while shutdown_server
+# doesn't.
+# we pass all necessary options as an arguments, so if someday this
+# will be changed, test still will work
+xtrabackup --stats --datadir=${MYSQLD_DATADIR} \
+	--innodb_log_group_home_dir=${TEST_BASEDIR}/logs
+
+vlog "stats did not fail"